summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/ndk-build-1.0/GStreamer.java60
-rw-r--r--data/ndk-build-1.0/fontconfig/fonts.conf126
-rw-r--r--data/ndk-build-1.0/fontconfig/fonts/Ubuntu-R.ttfbin353824 -> 0 bytes
-rw-r--r--data/ndk-build-1.0/gstreamer_prebuilt.mk70
-rw-r--r--data/ndk-build-1.0/tools.mk272
-rwxr-xr-xdata/ndk-build-1.0/tools/windows/libiconv2.dllbin1008128 -> 0 bytes
-rwxr-xr-xdata/ndk-build-1.0/tools/windows/libintl3.dllbin103424 -> 0 bytes
-rwxr-xr-xdata/ndk-build-1.0/tools/windows/pkg-config.exebin1506971 -> 0 bytes
-rwxr-xr-xdata/ndk-build-1.0/tools/windows/regex2.dllbin79360 -> 0 bytes
-rwxr-xr-xdata/ndk-build-1.0/tools/windows/sed.exebin77824 -> 0 bytes
-rwxr-xr-xdata/ndk-build/gstreamer-1.0.mk (renamed from data/ndk-build-1.0/gstreamer.mk)2
-rw-r--r--data/ndk-build/gstreamer_android-1.0.c.in (renamed from data/ndk-build-1.0/gstreamer_android.c.in)0
-rw-r--r--recipes/gst-android-1.0.recipe35
-rw-r--r--recipes/gst-android.recipe21
14 files changed, 40 insertions, 546 deletions
diff --git a/data/ndk-build-1.0/GStreamer.java b/data/ndk-build-1.0/GStreamer.java
deleted file mode 100644
index 6c58abe2..00000000
--- a/data/ndk-build-1.0/GStreamer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gstreamer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-
-public class GStreamer {
- private static native void nativeInit(Context context) throws Exception;
-
- public static void init(Context context) throws Exception {
- nativeInit(context);
- copyFonts(context);
- }
-
- private static void copyFonts(Context context) {
- AssetManager assetManager = context.getAssets();
- File filesDir = context.getFilesDir();
- File fontsFCDir = new File (filesDir, "fontconfig");
- File fontsDir = new File (fontsFCDir, "fonts");
- File fontsCfg = new File (fontsFCDir, "fonts.conf");
-
- fontsDir.mkdirs();
-
- try {
- /* Copy the config file */
- copyFile (assetManager, "fontconfig/fonts.conf", fontsCfg);
- /* Copy the fonts */
- for(String filename : assetManager.list("fontconfig/fonts/truetype")) {
- File font = new File(fontsDir, filename);
- copyFile (assetManager, "fontconfig/fonts/truetype/" + filename, font);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- private static void copyFile(AssetManager assetManager, String assetPath, File outFile) throws IOException {
- InputStream in;
- OutputStream out;
- byte[] buffer = new byte[1024];
- int read;
-
- if (outFile.exists())
- return;
-
- in = assetManager.open(assetPath);
- out = new FileOutputStream (outFile);
- while((read = in.read(buffer)) != -1){
- out.write(buffer, 0, read);
- }
- in.close();
- out.flush();
- out.close();
- }
-}
diff --git a/data/ndk-build-1.0/fontconfig/fonts.conf b/data/ndk-build-1.0/fontconfig/fonts.conf
deleted file mode 100644
index 445d8ce5..00000000
--- a/data/ndk-build-1.0/fontconfig/fonts.conf
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!-- Font directory list -->
-
- <dir prefix="xdg">fontconfig/fonts</dir>
-
-<!-- Font cache directory list -->
-
- <cachedir prefix="xdg">fontconfig</cachedir>
-
-<!--
- Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>mono</string>
- </test>
- <edit name="family" mode="assign" binding="same">
- <string>monospace</string>
- </edit>
- </match>
-
-<!--
- Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>sans serif</string>
- </test>
- <edit name="family" mode="assign" binding="same">
- <string>sans-serif</string>
- </edit>
- </match>
-
-<!--
- Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>sans</string>
- </test>
- <edit name="family" mode="assign" binding="same">
- <string>sans-serif</string>
- </edit>
- </match>
-
- <config>
-<!--
- These are the default Unicode chars that are expected to be blank
- in fonts. All other blank chars are assumed to be broken and
- won't appear in the resulting charsets
- -->
- <blank>
- <int>0x0020</int> <!-- SPACE -->
- <int>0x00A0</int> <!-- NO-BREAK SPACE -->
- <int>0x00AD</int> <!-- SOFT HYPHEN -->
- <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
- <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
- <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
- <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
- <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
- <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
- <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
- <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
- <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
- <int>0x1680</int> <!-- OGHAM SPACE MARK -->
- <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
- <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
- <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
- <int>0x2000</int> <!-- EN QUAD -->
- <int>0x2001</int> <!-- EM QUAD -->
- <int>0x2002</int> <!-- EN SPACE -->
- <int>0x2003</int> <!-- EM SPACE -->
- <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
- <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
- <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
- <int>0x2007</int> <!-- FIGURE SPACE -->
- <int>0x2008</int> <!-- PUNCTUATION SPACE -->
- <int>0x2009</int> <!-- THIN SPACE -->
- <int>0x200A</int> <!-- HAIR SPACE -->
- <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
- <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
- <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
- <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
- <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
- <int>0x2028</int> <!-- LINE SEPARATOR -->
- <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
- <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
- <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
- <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
- <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
- <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
- <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
- <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
- <int>0x2060</int> <!-- WORD JOINER -->
- <int>0x2061</int> <!-- FUNCTION APPLICATION -->
- <int>0x2062</int> <!-- INVISIBLE TIMES -->
- <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
- <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
- <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
- <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
- <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
- <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
- <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
- <int>0x2800</int> <!-- BRAILLE PATTERN BLANK -->
- <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
- <int>0x3164</int> <!-- HANGUL FILLER -->
- <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
- <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
- <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
- <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
- <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
- </blank>
-<!--
- Rescan configuration every 30 seconds when FcFontSetList is called
- -->
- <rescan>
- <int>30</int>
- </rescan>
- </config>
-
-</fontconfig>
-
diff --git a/data/ndk-build-1.0/fontconfig/fonts/Ubuntu-R.ttf b/data/ndk-build-1.0/fontconfig/fonts/Ubuntu-R.ttf
deleted file mode 100644
index 45a038ba..00000000
--- a/data/ndk-build-1.0/fontconfig/fonts/Ubuntu-R.ttf
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/gstreamer_prebuilt.mk b/data/ndk-build-1.0/gstreamer_prebuilt.mk
deleted file mode 100644
index 1440e3eb..00000000
--- a/data/ndk-build-1.0/gstreamer_prebuilt.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is included from prebuilt-shared-library.mk or
-# prebuilt-static-library.mk to declare prebuilt library binaries.
-#
-
-$(call assert-defined, LOCAL_BUILD_SCRIPT LOCAL_MAKEFILE LOCAL_PREBUILT_PREFIX LOCAL_PREBUILT_SUFFIX)
-
-$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-$(call check-LOCAL_MODULE_FILENAME)
-
-# Check that LOCAL_SRC_FILES contains only paths to shared libraries
-ifneq ($(words $(LOCAL_SRC_FILES)),1)
-$(call __ndk_info,ERROR:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): The LOCAL_SRC_FILES for a prebuilt static library should only contain one item))
-$(call __ndk_error,Aborting)
-endif
-
-bad_prebuilts := $(filter-out %$(LOCAL_PREBUILT_SUFFIX),$(LOCAL_SRC_FILES))
-ifdef bad_prebuilts
-$(call __ndk_info,ERROR:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): LOCAL_SRC_FILES should point to a file ending with "$(LOCAL_PREBUILT_SUFFIX)")
-$(call __ndk_info,The following file is unsupported: $(bad_prebuilts))
-$(call __ndk_error,Aborting)
-endif
-
-
-# HACK: This part was modified from the original file as
-# the shared library will be built with the gstreamer.mk rules
-prebuilt := $(GSTREAMER_ANDROID_SO)
-
-# If LOCAL_MODULE_FILENAME is defined, it will be used to name the file
-# in the TARGET_OUT directory, and then the installation one. Note that
-# if shouldn't have an .a or .so extension nor contain directory separators.
-#
-# If the variable is not defined, we determine its value from LOCAL_SRC_FILES
-#
-LOCAL_MODULE_FILENAME := $(strip $(LOCAL_MODULE_FILENAME))
-ifndef LOCAL_MODULE_FILENAME
- LOCAL_MODULE_FILENAME := $(notdir $(LOCAL_SRC_FILES))
- LOCAL_MODULE_FILENAME := $(LOCAL_MODULE_FILENAME:%$(LOCAL_PREBUILT_SUFFIX)=%)
-endif
-$(eval $(call ev-check-module-filename))
-
-LOCAL_BUILT_MODULE := $(TARGET_OUT)/$(LOCAL_MODULE_FILENAME)$(LOCAL_PREBUILT_SUFFIX)
-LOCAL_OBJS_DIR := $(TARGET_OBJS)/$(LOCAL_MODULE)
-LOCAL_OBJECTS := $(prebuilt)
-LOCAL_SRC_FILES :=
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
-
-delsharedlib:
- @$(call host-rm,$(prebuilt))
- @$(foreach path,$(wildcard $(GSTREAMER_BUILD_DIR)/sed*), $(call host-rm,$(path)))
-
-include $(BUILD_SYSTEM)/build-module.mk
-
-$(LOCAL_INSTALLED): delsharedlib
diff --git a/data/ndk-build-1.0/tools.mk b/data/ndk-build-1.0/tools.mk
deleted file mode 100644
index 65ac13d4..00000000
--- a/data/ndk-build-1.0/tools.mk
+++ /dev/null
@@ -1,272 +0,0 @@
-# cerbero - a multi-platform build system for Open Source software
-# Copyright (C) 2012 Andoni Morales Alastruey <ylatuya@gmail.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-################
-# pkg-config #
-################
-# Host tools
-# Make pkg-config relocatable
-# set PKG_CONFIG_LIBDIR and override the prefix and libdir variables
-ifeq ($(HOST_OS),windows)
- HOST_PKG_CONFIG := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/pkg-config
- # No space before the &&, or it will be added to PKG_CONFIG_LIBDIR
- PKG_CONFIG_ORIG := set PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig&& $(HOST_PKG_CONFIG)
- GSTREAMER_SDK_ROOT := $(subst \,/,$(GSTREAMER_SDK_ROOT))
-else
- HOST_PKG_CONFIG := pkg-config
- PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig $(HOST_PKG_CONFIG)
-endif
-
-PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_SDK_ROOT) --define-variable=libdir=$(GSTREAMER_SDK_ROOT)/lib
-
-# -----------------------------------------------------------------------------
-# Function : pkg-config-get-includes
-# Arguments: 1: package or list of packages
-# Returns : list of includes
-# Usage : $(call pkg-config-get-includes,<package>)
-# -----------------------------------------------------------------------------
-pkg-config-get-includes = \
- $(shell $(PKG_CONFIG) --cflags-only-I $1)
-
-# -----------------------------------------------------------------------------
-# Function : pkg-config-get-libs
-# Arguments: 1: package or list of packages
-# Returns : list of libraries to link this package
-# Usage : $(call pkg-config-get-libs,<package>)
-# -----------------------------------------------------------------------------
-pkg-config-get-libs = \
- $(shell $(PKG_CONFIG) --libs-only-l $1)
-
-# -----------------------------------------------------------------------------
-# Function : pkg-config-get-libs-no-deps
-# Arguments: 1: package or list of packages
-# Returns : list of -lfoo libraries for this packages without the deps
-# Usage : $(call pkg-config-get-libs,<package>)
-# -----------------------------------------------------------------------------
-pkg-config-get-libs-no-deps = \
- $(eval __tmpvar.libs := ) \
- $(foreach package,$1,\
- $(eval __tmpvar.libs += $(shell $(HOST_SED) -n 's/^Libs: \(.*\)/\1/p' $(GSTREAMER_SDK_ROOT)/lib/pkgconfig/$(package).pc)))\
- $(filter -l%, $(__tmpvar.libs))
-
-# -----------------------------------------------------------------------------
-# Function : pkg-config-get-prefix
-# Arguments: 1: package
-# Returns : a string with the prefix variable
-# Usage : $(call pkg-config-get-prefix,<package>)
-# -----------------------------------------------------------------------------
-pkg-config-get-prefix = \
- $(shell $(HOST_SED) -n 's/^prefix=\(.*\)/\1/p' $(GSTREAMER_SDK_ROOT)/lib/pkgconfig/$1.pc)
-
-# -----------------------------------------------------------------------------
-# Function : libtool-whole-archive
-# Arguments: 1: link command
-# 2: list of libraries for which we want to include the whole archive
-# Returns : the fixed link command
-# Usage : $(call libtool-link,<cmd>,<libs>)
-# -----------------------------------------------------------------------------
-WHOLE_ARCHIVE = -Wl,--whole-archive
-NO_WHOLE_ARCHIVE = -Wl,--no-whole-archive
-libtool-whole-archive = \
- $(eval __tmpvar.archives_paths := ) \
- $(foreach lib,$2, \
- $(eval __tmpvar.archives_paths += $(patsubst %.la,%.a,$(call libtool-find-lib,$(patsubst -l%,%,$(lib)))))) \
- $(eval __tmpvar.cmd := $1) \
- $(foreach ar,$(__tmpvar.archives_paths), \
- $(eval __tmpvar.cmd := $(patsubst %$(ar),$(WHOLE_ARCHIVE) %$(ar) $(NO_WHOLE_ARCHIVE),$(__tmpvar.cmd)))\
- )\
- $(call __libtool_log, "Link Command with whole archives:" $(__tmpvar.cmd))\
- $(__tmpvar.cmd)
-
-# -----------------------------------------------------------------------------
-# Function : libtool-link
-# Arguments: 1: link command
-# Returns : a link command with all the dependencies resolved as done by libtool
-# Usage : $(call libtool-link,<lib>)
-# -----------------------------------------------------------------------------
-libtool-link = \
- $(call libtool-clear-vars)\
- $(eval __libtool.link.command := $1)\
- $(call __libtool_log, original link command = $(__libtool.link.command))\
- $(eval __libtool.link.Lpath := $(call libtool-get-search-paths,$1))\
- $(call __libtool_log, Library Search Paths = $(__libtool.link.Lpath))\
- $(eval __libtool.link.libs := $(call libtool-get-libs,$1))\
- $(call __libtool_log, Libraries = $(__libtool.link.libs))\
- $(foreach library,$(__libtool.link.libs),$(call libtool-parse-lib,$(library)))\
- $(call libtool-gen-link-command)
-
-
-###############################################################################
-# #
-# This functions are private, don't use them directly #
-# #
-###############################################################################
-
-# -----------------------------------------------------------------------------
-# Function : libtool-parse-library
-# Arguments: 1: library name
-# Returns : ""
-# Usage : $(call libtool-parse-library,<libname>)
-# Note : Tries to find a libtool library for this name in the libraries search
-# path and parses it as well as its dependencies
-# -----------------------------------------------------------------------------
-libtool-parse-lib = \
- $(eval __tmpvar := $(strip $(call libtool-find-lib,$(patsubst -l%,%,$1))))\
- $(if $(__tmpvar), \
- $(call libtool-parse-file,$(__tmpvar),$(call libtool-name-from-filepath,$(__tmpvar))),\
- $(eval __libtool.link.shared_libs += $1)\
- $(call __libtool_log, libtool file not found for "$1" and will be added to the shared libs)\
- )
-
-# -----------------------------------------------------------------------------
-# Function : libtool-parse-file
-# Arguments: 1: libtool file
-# 2: library name
-# Returns : ""
-# Usage : $(call libtool-parse-file,<file>,<libname>)
-# Note :
-# Parses a libtool library and its dependencies recursively
-#
-# For each library it sets the following variables:
-# __libtool_libs.libname.LIBS -> non-libtool libraries linked with -lfoo
-# __libtool_libs.libname.STATIC_LIB -> link statically this library
-# __libtool_libs.libname.DYN_LIB -> link dynamically this library
-# __libtool_libs.libname.LIBS_SEARCH_PATH -> libraries search path
-#
-# Processed libraries are stored in __libtool_libs.processed, and
-# the list of libraries ordered by dependencies are stored in
-# __libtool_lbs.ordered
-# -----------------------------------------------------------------------------
-libtool-parse-file = \
- $(call __libtool_log, parsing file $1)\
- $(if $(call libtool-lib-processed,$2),\
- $(call __libtool_log, library $2 already parsed),\
- $(eval __libtool_libs.$2.STATIC_LIB := $(patsubst %.la,%.a,$1))\
- $(eval __libtool_libs.$2.DYN_LIB := -l$2)\
- $(eval __tmpvar.$2.dep_libs := $(call libtool-get-dependency-libs,$1))\
- $(eval __tmpvar.$2.dep_libs := $(call libtool-replace-prefixes,$(__tmpvar.$2.dep_libs)))\
- $(eval __libtool_libs.$2.LIBS := $(call libtool-get-libs,$(__tmpvar.$2.dep_libs)))\
- $(eval __libtool_libs.$2.LIBS_SEARCH_PATH := $(call libtool-get-search-paths,$(__tmpvar.$2.dep_libs)))\
- $(call __libtool_log, $2.libs = $(__libtool_libs.$2.LIBS))\
- $(eval __tmpvar.$2.file_deps := $(call libtool-get-libtool-deps,$(__tmpvar.$2.dep_libs)))\
- $(eval __libtool_libs.$2.DEPS := $(foreach path,$(__tmpvar.$2.file_deps), $(call libtool-name-from-filepath,$(path))))\
- $(call __libtool_log, $2.deps = $(__libtool_libs.$2.DEPS)) \
- $(eval __libtool_libs.processed += $2) \
- $(call __libtool_log, parsed libraries: $(__libtool_libs.processed))\
- $(foreach library,$(__libtool_libs.$2.DEPS), $(call libtool-parse-lib,$(library)))\
- $(eval __libtool_libs.ordered += $2)\
- $(call __libtool_log, ordered list of libraries: $(__libtool_libs.ordered))\
- )
-
-__libtool_log = \
- $(if $(strip $(LIBTOOL_DEBUG)),\
- $(call __libtool_info,$1),\
- )
-
-__libtool_info = $(info LIBTOOL: $1)
-
-libtool-clear-vars = \
- $(foreach lib,$(__libtool_libs.processed),\
- $(eval __libtool_libs.$(lib).LIBS := $(empty))\
- $(eval __libtool_libs.$(lib).STATIC_LIB := $(empty))\
- $(eval __libtool_libs.$(lib).DYN_LIB := $(empty))\
- $(eval __libtool_libs.$(lib).LIBS_SEARCH_PATH := $(empty))\
- )\
- $(eval __libtool_libs.ordered := $(empty))\
- $(eval __libtool_libs.processed := $(empty))\
- $(eval __libtool.link.Lpath := $(empty))\
- $(eval __libtool.link.command := $(empty))\
- $(eval __libtool.link.libs := $(empty))\
- $(eval __libtool.link.shared_libs := $(empty))
-
-libtool-lib-processed = \
- $(findstring ___$1___, $(foreach lib,$(__libtool_libs.processed), ___$(lib)___))
-
-libtool-gen-link-command = \
- $(eval __tmpvar.cmd := $(filter-out -L%,$(__libtool.link.command)))\
- $(eval __tmpvar.cmd := $(filter-out -l%,$(__tmpvar.cmd)))\
- $(eval __tmpvar.cmd += $(__libtool.link.Lpath))\
- $(eval __tmpvar.cmd += $(call libtool-get-libs-search-paths))\
- $(eval __tmpvar.cmd += $(call libtool-get-all-libs))\
- $(eval __tmpvar.cmd += $(__libtool.link.shared_libs))\
- $(call __libtool_log, "Link Command:" $(__tmpvar.cmd))\
- $(__tmpvar.cmd)
-
-libtool-get-libs-search-paths = \
- $(eval __tmpvar.paths := $(empty))\
- $(foreach library,$(__libtool_libs.ordered),\
- $(foreach path,$(__libtool_libs.$(library).LIBS_SEARCH_PATH),\
- $(if $(findstring $(path), $(__tmpvar.paths)), ,\
- $(eval __tmpvar.paths += $(path))\
- )\
- )\
- )\
- $(call __libtool_log, search paths $(__tmpvar.paths))\
- $(strip $(__tmpvar.paths))
-
-libtool-get-all-libs = \
- $(eval __tmpvar.static_libs_reverse := $(empty))\
- $(eval __tmpvar.static_libs := $(empty))\
- $(eval __tmpvar.libs := $(empty))\
- $(foreach library,$(__libtool_libs.ordered),\
- $(eval __tmpvar.static_libs_reverse += $(__libtool_libs.$(library).STATIC_LIB))\
- $(foreach dylib,$(__libtool_libs.$(library).LIBS),\
- $(if $(findstring $(dylib), $(__tmpvar.libs)), ,\
- $(eval __tmpvar.libs += $(dylib))\
- )\
- )\
- )\
- $(foreach path,$(__tmpvar.static_libs_reverse),\
- $(eval __tmpvar.static_libs := $(path) $(__tmpvar.static_libs))\
- )\
- $(strip $(__tmpvar.static_libs) $(__tmpvar.libs) )
-
-libtool-find-lib = \
- $(eval __tmpvar := $(empty))\
- $(foreach path,$(__libtool.link.Lpath),\
- $(eval __tmpvar += $(wildcard $(patsubst -L%,%,$(path))/lib$1.la))\
- ) \
- $(firstword $(__tmpvar))
-
-libtool-clear-vars = \
- $(eval __libtool.link.command := $(empty))
- $(eval __libtool.link.Lpath := $(empty))
-
-libtool-name-from-filepath = \
- $(patsubst lib%.la,%,$(notdir $1))
-
-libtool-get-libtool-deps = \
- $(filter %.la,$1)
-
-libtool-get-deps = \
- $(filter %.la,$1)
-
-libtool-get-libs = \
- $(filter -l%,$1)
-
-libtool-get-search-paths = \
- $(filter -L%,$1)
-
-libtool-get-dependency-libs = \
- $(shell $(HOST_SED) -n "s/^dependency_libs='\(.*\)'/\1/p" $1)
-
-libtool-replace-prefixes = \
- $(subst $(BUILD_PREFIX),$(GSTREAMER_SDK_ROOT),$1 )
-
-libtool-get-static-library = \
- $(shell $(HOST_SED) -n "s/^old_library='\(.*\)'/\1/p" $1)
diff --git a/data/ndk-build-1.0/tools/windows/libiconv2.dll b/data/ndk-build-1.0/tools/windows/libiconv2.dll
deleted file mode 100755
index 544dd92f..00000000
--- a/data/ndk-build-1.0/tools/windows/libiconv2.dll
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/tools/windows/libintl3.dll b/data/ndk-build-1.0/tools/windows/libintl3.dll
deleted file mode 100755
index ec11e6b1..00000000
--- a/data/ndk-build-1.0/tools/windows/libintl3.dll
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/tools/windows/pkg-config.exe b/data/ndk-build-1.0/tools/windows/pkg-config.exe
deleted file mode 100755
index 3821dc46..00000000
--- a/data/ndk-build-1.0/tools/windows/pkg-config.exe
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/tools/windows/regex2.dll b/data/ndk-build-1.0/tools/windows/regex2.dll
deleted file mode 100755
index f84a847a..00000000
--- a/data/ndk-build-1.0/tools/windows/regex2.dll
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/tools/windows/sed.exe b/data/ndk-build-1.0/tools/windows/sed.exe
deleted file mode 100755
index 3190377c..00000000
--- a/data/ndk-build-1.0/tools/windows/sed.exe
+++ /dev/null
Binary files differ
diff --git a/data/ndk-build-1.0/gstreamer.mk b/data/ndk-build/gstreamer-1.0.mk
index 621a66f5..4746a878 100755
--- a/data/ndk-build-1.0/gstreamer.mk
+++ b/data/ndk-build/gstreamer-1.0.mk
@@ -59,7 +59,7 @@ GSTREAMER_BUILD_DIR := gst-build
GSTREAMER_ANDROID_O := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).o
GSTREAMER_ANDROID_SO := $(GSTREAMER_BUILD_DIR)/lib$(GSTREAMER_ANDROID_MODULE_NAME).so
GSTREAMER_ANDROID_C := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).c
-GSTREAMER_ANDROID_C_IN := $(GSTREAMER_NDK_BUILD_PATH)/gstreamer_android.c.in
+GSTREAMER_ANDROID_C_IN := $(GSTREAMER_NDK_BUILD_PATH)/gstreamer_android-1.0.c.in
GSTREAMER_DEPS := $(GSTREAMER_EXTRA_DEPS) gstreamer-1.0
GSTREAMER_LD := -fuse-ld=gold
diff --git a/data/ndk-build-1.0/gstreamer_android.c.in b/data/ndk-build/gstreamer_android-1.0.c.in
index 2d1304b4..2d1304b4 100644
--- a/data/ndk-build-1.0/gstreamer_android.c.in
+++ b/data/ndk-build/gstreamer_android-1.0.c.in
diff --git a/recipes/gst-android-1.0.recipe b/recipes/gst-android-1.0.recipe
index 779849a9..efd6e48a 100644
--- a/recipes/gst-android-1.0.recipe
+++ b/recipes/gst-android-1.0.recipe
@@ -1,4 +1,6 @@
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+import os
+import shutil
from cerbero.utils import shell
from custom import list_gstreamer_1_0_plugins_by_category
@@ -10,23 +12,32 @@ class Recipe(recipe.Recipe):
btype = BuildType.CUSTOM
files_devel = [
- 'share/gst-android/ndk-build-1.0/gstreamer_android.c.in',
- 'share/gst-android/ndk-build-1.0/gstreamer.mk',
- 'share/gst-android/ndk-build-1.0/gstreamer_prebuilt.mk',
- 'share/gst-android/ndk-build-1.0/tools.mk',
- 'share/gst-android/ndk-build-1.0/plugins.mk',
- 'share/gst-android/ndk-build-1.0/GStreamer.java',
- 'share/gst-android/ndk-build-1.0/tools/windows',
- 'share/gst-android/ndk-build-1.0/fontconfig',
+ 'share/gst-android/ndk-build/gstreamer_android-1.0.c.in',
+ 'share/gst-android/ndk-build/gstreamer-1.0.mk',
+ 'share/gst-android/ndk-build/gstreamer_prebuilt.mk',
+ 'share/gst-android/ndk-build/tools.mk',
+ 'share/gst-android/ndk-build/plugins.mk',
+ 'share/gst-android/ndk-build/GStreamer.java',
+ 'share/gst-android/ndk-build/tools',
+ 'share/gst-android/ndk-build/fontconfig',
]
def install(self):
- ndk_build_dir = os.path.join(self.config.prefix, 'share', 'gst-android', 'ndk-build-1.0')
- shell.copy_dir(os.path.join(self.config.data_dir, 'ndk-build-1.0'),
- ndk_build_dir)
+ ndk_build_dir_dst = os.path.join(self.config.prefix, 'share', 'gst-android', 'ndk-build')
+ if not os.path.exists(ndk_build_dir_dst):
+ os.makedirs(ndk_build_dir_dst)
+ ndk_build_dir_src = os.path.join(self.config.data_dir, 'ndk-build')
+ for f in self.files_devel:
+ fname = os.path.basename(f)
+ s = os.path.join(ndk_build_dir_src, fname)
+ d = os.path.join(ndk_build_dir_dst, fname)
+ if os.path.isfile(s):
+ shutil.copy(s, d)
+ else:
+ shell.copy_dir(s, d)
plugins, replacements = list_gstreamer_1_0_plugins_by_category(self.config)
- f = open(os.path.join(ndk_build_dir, 'plugins.mk'), 'w')
+ f = open(os.path.join(ndk_build_dir_dst, 'plugins.mk'), 'w')
for c, p in plugins.iteritems():
p = ' '.join(p)
for k,v in replacements.iteritems():
diff --git a/recipes/gst-android.recipe b/recipes/gst-android.recipe
index 25cc7f2c..e5431867 100644
--- a/recipes/gst-android.recipe
+++ b/recipes/gst-android.recipe
@@ -1,4 +1,6 @@
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+import os
+import shutil
from cerbero.utils import shell
from custom import list_gstreamer_plugins_by_category
@@ -16,17 +18,26 @@ class Recipe(recipe.Recipe):
'share/gst-android/ndk-build/tools.mk',
'share/gst-android/ndk-build/plugins.mk',
'share/gst-android/ndk-build/GStreamer.java',
- 'share/gst-android/ndk-build/tools/windows',
+ 'share/gst-android/ndk-build/tools',
'share/gst-android/ndk-build/fontconfig',
]
def install(self):
- ndk_build_dir = os.path.join(self.config.prefix, 'share', 'gst-android', 'ndk-build')
- shell.copy_dir(os.path.join(self.config.data_dir, 'ndk-build'),
- ndk_build_dir)
+ ndk_build_dir_dst = os.path.join(self.config.prefix, 'share', 'gst-android', 'ndk-build')
+ if not os.path.exists(ndk_build_dir_dst):
+ os.makedirs(ndk_build_dir_dst)
+ ndk_build_dir_src = os.path.join(self.config.data_dir, 'ndk-build')
+ for f in self.files_devel:
+ fname = os.path.basename(f)
+ s = os.path.join(ndk_build_dir_src, fname)
+ d = os.path.join(ndk_build_dir_dst, fname)
+ if os.path.isfile(s):
+ shutil.copy(s, d)
+ else:
+ shell.copy_dir(s, d)
plugins, replacements = list_gstreamer_plugins_by_category(self.config)
- f = open(os.path.join(ndk_build_dir, 'plugins.mk'), 'w')
+ f = open(os.path.join(ndk_build_dir_dst, 'plugins.mk'), 'w')
for c, p in plugins.iteritems():
p = ' '.join(p)
for k,v in replacements.iteritems():
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 16:30:02 +0000