diff options
| -rw-r--r-- | packages/gstreamer-1.0-codecs-restricted.package | 4 | ||||
| -rw-r--r-- | packages/gstreamer-1.0-codecs.package | 5 | ||||
| -rw-r--r-- | packages/gstreamer-1.0-dvd.package | 6 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 6 | ||||
| -rw-r--r-- | recipes/gst-plugins-good-1.0.recipe | 7 | ||||
| -rw-r--r-- | recipes/gst-plugins-ugly-1.0.recipe | 8 |
6 files changed, 31 insertions, 5 deletions
diff --git a/packages/gstreamer-1.0-codecs-restricted.package b/packages/gstreamer-1.0-codecs-restricted.package index 9513b55f..a39a65ad 100644 --- a/packages/gstreamer-1.0-codecs-restricted.package +++ b/packages/gstreamer-1.0-codecs-restricted.package @@ -18,6 +18,10 @@ class Package(custom.GStreamer, package.Package): 'gst-plugins-bad-1.0:plugins_codecs_restricted_devel'] def prepare(self): + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.files.remove('a52dec:libs') + if self.config.variants.uwp: self.files = [ 'gst-plugins-ugly-1.0:plugins_codecs_restricted', diff --git a/packages/gstreamer-1.0-codecs.package b/packages/gstreamer-1.0-codecs.package index 0781454f..75d50fed 100644 --- a/packages/gstreamer-1.0-codecs.package +++ b/packages/gstreamer-1.0-codecs.package @@ -45,6 +45,11 @@ class Package(custom.GStreamer, package.Package): # Needed by zbar library self.files.append('libiconv:libs') + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.files.remove('wavpack:libs') + self.files.remove('libdv:libs') + if self.config.variants.uwp: self.files = [ 'libvpx:libs', 'openh264:libs', 'opus:libs', diff --git a/packages/gstreamer-1.0-dvd.package b/packages/gstreamer-1.0-dvd.package index 4e2c1095..649af673 100644 --- a/packages/gstreamer-1.0-dvd.package +++ b/packages/gstreamer-1.0-dvd.package @@ -19,3 +19,9 @@ class Package(custom.GStreamer, package.Package): 'gst-plugins-good-1.0:plugins_dvd_devel', 'gst-plugins-ugly-1.0:plugins_dvd_devel', 'gst-plugins-bad-1.0:plugins_dvd_devel'] + + def prepare(self): + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.files.remove('libdvdnav:libs') + self.files.remove('libdvdread:libs') diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 42691651..24b1c5f6 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -498,10 +498,14 @@ class Recipe(custom.GStreamer): (self.config.target_platform == Platform.IOS and self.config.target_arch != Architecture.ARM64): self.disable_plugin('vulkan', 'vulkan', library_name='vulkan') - if self.using_uwp() or self.config.target_platform in (Platform.ANDROID, Platform.IOS): + if self.config.target_platform in (Platform.ANDROID, Platform.IOS): self.disable_plugin('resindvd', 'dvd', dep='libdvdnav') self.disable_plugin('nvcodec', 'codecs') + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.disable_plugin('resindvd', 'dvd', dep='libdvdnav') + # dtls plugin needs openssl, and we pick up the system openssl if on # Linux and not cross-compiling. if self.config.target_platform != Platform.LINUX or self.config.cross_compiling(): diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe index d54b1030..1d2dacb7 100644 --- a/recipes/gst-plugins-good-1.0.recipe +++ b/recipes/gst-plugins-good-1.0.recipe @@ -249,6 +249,11 @@ class Recipe(custom.GStreamer): if can_enable_qt5: self.enable_plugin('qmlgl', 'qt5', 'qt5', option='qt5') + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.disable_plugin('dv', 'codecs', dep='libdv') + self.disable_plugin('wavpack', 'codecs', dep='wavpack') + if self.using_msvc(): # plugin is C++, library is Autotools self.disable_plugin('taglib', 'codecs', dep='taglib') @@ -258,7 +263,6 @@ class Recipe(custom.GStreamer): self.disable_plugin('directsound', 'sys') # External deps that haven't been ported to UWP self.disable_plugin('cairo', 'effects', dep='cairo') - self.disable_plugin('dv', 'codecs', dep='libdv') self.disable_plugin('flac', 'codecs', dep='flac') self.disable_plugin('gdkpixbuf', 'effects', option='gdk-pixbuf', dep='gdk-pixbuf') self.disable_plugin('jpeg', 'codecs', dep='libjpeg-turbo') @@ -267,7 +271,6 @@ class Recipe(custom.GStreamer): self.disable_plugin('png', 'codecs', dep='libpng') self.disable_plugin('soup', 'net', dep='libsoup') self.disable_plugin('speex', 'codecs', dep='speex') - self.disable_plugin('wavpack', 'codecs', dep='wavpack') if self.config.variants.nodebug: self.append_env('CFLAGS', '-DGST_LEVEL_MAX=GST_LEVEL_FIXME') diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe index c4eb29d0..d31cda84 100644 --- a/recipes/gst-plugins-ugly-1.0.recipe +++ b/recipes/gst-plugins-ugly-1.0.recipe @@ -48,11 +48,15 @@ class Recipe(custom.GStreamer): files_lang = ['gst-plugins-ugly-1.0'] def prepare(self): - if self.using_uwp() or self.config.target_platform in (Platform.ANDROID, Platform.IOS): + if self.config.target_platform in (Platform.ANDROID, Platform.IOS): self.disable_plugin('dvdread', 'dvd', dep='libdvdread') - if self.using_uwp(): + # Recipes that need autoreconf hang on the Windows CI + if self.config.platform == Platform.WINDOWS: + self.disable_plugin('dvdread', 'dvd', dep='libdvdread') self.disable_plugin('a52dec', 'codecs_restricted', dep='a52dec') + + if self.using_uwp(): self.disable_plugin('amrnb', 'codecs_restricted', dep='opencore-amr') self.disable_plugin('amrwbdec', 'codecs_restricted', dep='opencore-amr') self.disable_plugin('x264', 'codecs_restricted', dep='x264') |