summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes/build-tools/bison.recipe1
-rw-r--r--recipes/build-tools/flex.recipe1
-rw-r--r--recipes/build-tools/gettext-tools.recipe1
-rw-r--r--recipes/build-tools/glib-tools.recipe4
-rw-r--r--recipes/build-tools/gobject-introspection-m4.recipe1
-rw-r--r--recipes/build-tools/libffi-tools.recipe14
-rw-r--r--recipes/build-tools/ninja.recipe6
-rw-r--r--recipes/build-tools/pkg-config.recipe1
-rw-r--r--recipes/build-tools/zlib-tools.recipe19
-rw-r--r--recipes/fontconfig.recipe2
-rw-r--r--recipes/gst-android-1.0.recipe4
-rw-r--r--recipes/gst-rtsp-server-1.0.recipe2
-rw-r--r--recipes/gst-validate.recipe2
-rw-r--r--recipes/gstreamer-ios-templates.recipe4
-rw-r--r--recipes/srt.recipe2
-rw-r--r--recipes/zbar.recipe5
16 files changed, 61 insertions, 8 deletions
diff --git a/recipes/build-tools/bison.recipe b/recipes/build-tools/bison.recipe
index 0d9b1abc..b237357a 100644
--- a/recipes/build-tools/bison.recipe
+++ b/recipes/build-tools/bison.recipe
@@ -8,6 +8,7 @@ class Recipe(recipe.Recipe):
stype = SourceType.TARBALL
url = 'gnu://'
tarball_checksum = 'a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1'
+ deps = ['automake', 'autoconf', 'gettext-tools']
patches = ['bison/0001-Fix-build-invalid-instruction-on-macOS-10.3.patch']
diff --git a/recipes/build-tools/flex.recipe b/recipes/build-tools/flex.recipe
index 638f26a3..8f1d9c52 100644
--- a/recipes/build-tools/flex.recipe
+++ b/recipes/build-tools/flex.recipe
@@ -12,3 +12,4 @@ class Recipe(recipe.Recipe):
patches = ['flex/flex-prevent-to-build-doc.patch']
autoreconf = True
platform_deps = {Platform.WINDOWS: ['mingw-gettext']}
+ deps = ['automake', 'autoconf', 'gettext-tools']
diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe
index b630c8c6..cea971ca 100644
--- a/recipes/build-tools/gettext-tools.recipe
+++ b/recipes/build-tools/gettext-tools.recipe
@@ -14,6 +14,7 @@ class Recipe(recipe.Recipe):
tarball_dirname = 'gettext-%(version)s'
tarball_checksum = '53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800'
+ deps = ['automake', 'autoconf', 'm4', 'libtool']
platform_deps = {
Platform.DARWIN: ['sed'],
Platform.WINDOWS: ['libiconv', 'mingw-runtime', 'automake'],}
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe
index 21c5948e..183d6005 100644
--- a/recipes/build-tools/glib-tools.recipe
+++ b/recipes/build-tools/glib-tools.recipe
@@ -11,7 +11,7 @@ class Recipe(recipe.Recipe):
btype = BuildType.MESON
meson_options = {'internal_pcre': 'true', 'libmount': 'false',
'dtrace': 'false', 'iconv': 'libc', 'selinux' : 'false'}
- deps = ['libffi', 'zlib']
+ deps = ['libffi-tools', 'zlib-tools', 'pkg-config', 'meson', 'gettext-tools']
patches = ['../glib/glib-2.57-meson-backported-fixes.patch',
'../glib/0001-gengiotypefuncs.py-Read-and-parse-files-in-binary-mo.patch',
# XXX: Remove when we upgrade our mingw toolchain
@@ -33,6 +33,8 @@ class Recipe(recipe.Recipe):
# Other platforms don't provide libiconv, so we build it
else:
self.meson_options.update({'iconv': 'gnu'})
+ self.deps.append('libiconv')
+
if self.config.target_platform == Platform.WINDOWS:
# Want secure versions of stdlib functions. Glib already defines
# _WIN32_WINNT, so undefine it on the cmdline to avoid warnings
diff --git a/recipes/build-tools/gobject-introspection-m4.recipe b/recipes/build-tools/gobject-introspection-m4.recipe
index c0fd7746..b5496ee9 100644
--- a/recipes/build-tools/gobject-introspection-m4.recipe
+++ b/recipes/build-tools/gobject-introspection-m4.recipe
@@ -16,6 +16,7 @@ class Recipe(recipe.Recipe):
licenses = [License.GPLv2Plus]
btype = BuildType.CUSTOM
files_devel = ['share/aclocal/introspection.m4']
+ override_libtool = False
def install(self):
shutil.copy(os.path.join(self.build_dir, 'm4', 'introspection.m4'),
diff --git a/recipes/build-tools/libffi-tools.recipe b/recipes/build-tools/libffi-tools.recipe
new file mode 100644
index 00000000..339bd7e9
--- /dev/null
+++ b/recipes/build-tools/libffi-tools.recipe
@@ -0,0 +1,14 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+class Recipe(recipe.Recipe):
+ name = 'libffi-tools'
+ version = '3.2.9999'
+ remotes = {'origin': 'https://github.com/libffi/libffi.git'.format(name)}
+ commit = '369ef49f71186fc9d6ab15614488ad466fac3fc1'
+ licenses = [{License.BSD_like: ['LICENSE']}]
+ btype = BuildType.MESON
+ patches = ['../libffi/libffi-port-to-meson-and-msvc.patch']
+ deps = ['meson']
+
+ files_libs = ['libffi']
+ files_devel = ['include/ffi*.h', 'lib/pkgconfig/libffi.pc']
diff --git a/recipes/build-tools/ninja.recipe b/recipes/build-tools/ninja.recipe
index 7bbddbb0..53f8b3a7 100644
--- a/recipes/build-tools/ninja.recipe
+++ b/recipes/build-tools/ninja.recipe
@@ -9,7 +9,6 @@ class Recipe(recipe.Recipe):
url = 'https://github.com/ninja-build/ninja/archive/v%(version)s.tar.gz'
tarball_checksum = '5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9'
patches = ['ninja/0001-configure.py-Look-for-cl.exe-before-assuming-MSVC.patch']
- deps = []
files_bin = ['bin/ninja']
@@ -21,5 +20,8 @@ class Recipe(recipe.Recipe):
ninja = 'ninja'
if self.platform == Platform.WINDOWS:
ninja += '.exe'
+ bindir = os.path.join (self.config.prefix, "bin")
+ if not os.path.exists(bindir):
+ os.makedirs(bindir)
os.replace(os.path.join(self.build_dir, ninja),
- os.path.join (self.config.prefix, "bin", ninja))
+ os.path.join(bindir, ninja))
diff --git a/recipes/build-tools/pkg-config.recipe b/recipes/build-tools/pkg-config.recipe
index 9b98f6ac..1e61a2d3 100644
--- a/recipes/build-tools/pkg-config.recipe
+++ b/recipes/build-tools/pkg-config.recipe
@@ -9,6 +9,7 @@ class Recipe(recipe.Recipe):
url = 'https://pkgconfig.freedesktop.org/releases/pkg-config-%(version)s.tar.gz'
tarball_checksum = '6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591'
configure_options = '--with-internal-glib --disable-host-tool '
+ deps = ['libtool']
files_bins = ['pkg-config']
files_share = ['share/aclocal/pkg.m4']
diff --git a/recipes/build-tools/zlib-tools.recipe b/recipes/build-tools/zlib-tools.recipe
new file mode 100644
index 00000000..857cb248
--- /dev/null
+++ b/recipes/build-tools/zlib-tools.recipe
@@ -0,0 +1,19 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(recipe.Recipe):
+ name = 'zlib-tools'
+ version = '1.2.11'
+ stype = SourceType.TARBALL
+ btype = BuildType.MESON
+ url = 'https://zlib.net/fossils/zlib-%(version)s.tar.gz'
+ tarball_checksum = 'c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1'
+ tarball_name = 'zlib-%(version)s.tar.gz'
+ tarball_dirname = 'zlib-%(version)s'
+ licenses = [{License.BSD_like: ['README']}]
+ patches = ['../zlib/0001-win32-fix-dll-name.patch',
+ '../zlib/0001-Fix-test-builds-to-use-the-built-libz-headers-librar.patch',
+ '../zlib/0001-Add-a-meson-port.patch']
+ files_libs = ['libz']
+ files_devel = ['include/zlib.h', 'include/zconf.h', 'lib/pkgconfig/zlib.pc']
+ deps = ['meson']
diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe
index db368651..ab0257ed 100644
--- a/recipes/fontconfig.recipe
+++ b/recipes/fontconfig.recipe
@@ -29,6 +29,8 @@ class Recipe(recipe.Recipe):
autoreconf = True
def prepare(self):
+ if self.config.target_platform in (Platform.WINDOWS, Platform.ANDROID):
+ self.deps.append('libiconv')
if needs_xcode8_sdk_workaround(self.config):
self.set_env('ac_cv_func_mkostemp', 'no')
if self.config.target_platform == Platform.WINDOWS:
diff --git a/recipes/gst-android-1.0.recipe b/recipes/gst-android-1.0.recipe
index b8abefeb..7bc1e6fa 100644
--- a/recipes/gst-android-1.0.recipe
+++ b/recipes/gst-android-1.0.recipe
@@ -10,6 +10,10 @@ class Recipe(recipe.Recipe):
licenses = [License.LGPLv2_1Plus]
stype = SourceType.CUSTOM
btype = BuildType.CUSTOM
+ deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-good-1.0',
+ 'gst-plugins-ugly-1.0', 'gst-plugins-bad-1.0', 'gst-libav-1.0',
+ 'gst-validate', 'gst-rtsp-server-1.0', 'gst-editing-services-1.0'
+ ]
files_devel = [
'share/gst-android/ndk-build/gstreamer_android-1.0.c.in',
diff --git a/recipes/gst-rtsp-server-1.0.recipe b/recipes/gst-rtsp-server-1.0.recipe
index 0c221bbd..bfd62967 100644
--- a/recipes/gst-rtsp-server-1.0.recipe
+++ b/recipes/gst-rtsp-server-1.0.recipe
@@ -4,7 +4,7 @@ class Recipe(custom.GStreamer):
name = 'gst-rtsp-server-1.0'
btype = BuildType.MESON
tarball_checksum = '198e9eec1a3e32dc810d3fbf3a714850a22c6288d4a5c8e802c5ff984af03f19'
- deps = ['gstreamer-1.0', 'gst-plugins-base-1.0' ]
+ deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-bad-1.0']
files_devel = ['include/gstreamer-1.0/gst/rtsp-server', 'lib/pkgconfig/gstreamer-rtsp-server-1.0.pc']
files_libs = ['libgstrtspserver-1.0']
diff --git a/recipes/gst-validate.recipe b/recipes/gst-validate.recipe
index f13cf436..c9cb0a96 100644
--- a/recipes/gst-validate.recipe
+++ b/recipes/gst-validate.recipe
@@ -10,7 +10,7 @@ class Recipe(custom.GStreamer):
stype = SourceType.GIT
remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/gst-devtools.git'}
srcdir = 'validate'
- deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'json-glib']
+ deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'json-glib', 'gst-rtsp-server-1.0']
files_bins = ['gst-validate-1.0', 'gst-validate-transcoding-1.0', 'gst-validate-media-check-1.0',
'gst-validate-rtsp-server-1.0']
diff --git a/recipes/gstreamer-ios-templates.recipe b/recipes/gstreamer-ios-templates.recipe
index 37ac77d8..920b0c3c 100644
--- a/recipes/gstreamer-ios-templates.recipe
+++ b/recipes/gstreamer-ios-templates.recipe
@@ -17,6 +17,10 @@ class Recipe(recipe.Recipe):
licenses = [License.LGPLv2_1Plus]
stype = SourceType.CUSTOM
btype = BuildType.CUSTOM
+ deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-good-1.0',
+ 'gst-plugins-ugly-1.0', 'gst-plugins-bad-1.0', 'gst-libav-1.0',
+ 'gst-validate', 'gst-rtsp-server-1.0', 'gst-editing-services-1.0'
+ ]
files_devel = [
'share/xcode/templates/ios/',
diff --git a/recipes/srt.recipe b/recipes/srt.recipe
index 1dcac345..ff95ba7d 100644
--- a/recipes/srt.recipe
+++ b/recipes/srt.recipe
@@ -21,7 +21,7 @@ class Recipe(recipe.Recipe):
if self.config.target_platform == Platform.ANDROID:
self.append_env('CXXFLAGS', '-frtti', '-fexceptions')
self.configure_options += ' -DUSE_GNUSTL=ON'
- self.deps += ['gnustl']
+ self.deps.append('gnustl')
def post_install(self):
libtool_la = LibtoolLibrary('srt', None, None, None, self.config.libdir,
diff --git a/recipes/zbar.recipe b/recipes/zbar.recipe
index 41a92e3d..f25e33cc 100644
--- a/recipes/zbar.recipe
+++ b/recipes/zbar.recipe
@@ -11,10 +11,11 @@ class Recipe(recipe.Recipe):
files_devel = ['include/zbar.h', 'lib/pkgconfig/zbar.pc']
def prepare(self):
+ if self.config.target_platform in (Platform.WINDOWS, Platform.ANDROID):
+ self.deps.append('libiconv')
if self.config.target_platform == Platform.WINDOWS:
- self.deps += [ 'libiconv' ]
# This flag should be removed in 0.24
self.append_env('CFLAGS', '-std=c99')
- elif self.config.target_platform in [Platform.IOS, Platform.DARWIN]:
+ if self.config.target_platform in [Platform.IOS, Platform.DARWIN]:
self.autoreconf = True
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 02:17:11 +0000