diff options
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/at-spi2-core-meson-compat.patch | 18 | ||||
-rw-r--r-- | gnu/packages/patches/gst-plugins-good-libvpx-compat.patch | 58 |
2 files changed, 0 insertions, 76 deletions
diff --git a/gnu/packages/patches/at-spi2-core-meson-compat.patch b/gnu/packages/patches/at-spi2-core-meson-compat.patch deleted file mode 100644 index 168a31b4ed..0000000000 --- a/gnu/packages/patches/at-spi2-core-meson-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with Meson 0.50.0 and above. - -Taken from upstream repository: -https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a - -diff --git a/atspi/meson.build b/atspi/meson.build -index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644 ---- a/atspi/meson.build -+++ b/atspi/meson.build -@@ -57,7 +57,7 @@ atspi_headers = [ - - atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') - --install_headers(atspi_headers, subdir: atspi_includedir) -+install_headers(atspi_headers, install_dir: atspi_includedir) - - atspi_enums = gnome.mkenums('atspi-enum-types', - sources: [ 'atspi-constants.h', 'atspi-types.h' ], diff --git a/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch b/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch deleted file mode 100644 index 8306c79e56..0000000000 --- a/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix build with libvpx 1.8. - -Taken from this upstream commit: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/b6e6f1ae73375ef66a5748069843aaed1a83e6a6 - -Note: Remove the HAVE_VPX_1_8 build flag with this patch. It was added -to avoid re-creating the configure script. - -diff --git a/configure.ac b/configure.ac -index 5e4cff126..8c20e5081 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ - AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) - ], [true]) - -+ PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [ -+ AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger]) -+ ], [true]) -+ - LIBS="$OLD_LIBS" - CFLAGS="$OLD_CFLAGS" - fi -diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c -index c3f0f625f..da4322513 100644 ---- a/ext/vpx/gstvpxdec.c -+++ b/ext/vpx/gstvpxdec.c -@@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) - {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, - {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, - {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, -+#ifndef HAVE_VPX_1_8 - {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), - "Print frame information", - "visualize-frame-info"}, -@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) - {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), - "Print video rate info", - "visualize-rate-info"}, -+#endif - {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, - {0, NULL, NULL} - }; -diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build -index 6ed440728..0d2340b32 100644 ---- a/ext/vpx/meson.build -+++ b/ext/vpx/meson.build -@@ -48,6 +48,10 @@ if vpx_dep.found() - vpx_args += '-DHAVE_VPX_1_4' - endif - -+ if dependency('vpx', version : '>=1.8.0', required : false).found() -+ vpx_args += '-DHAVE_VPX_1_8' -+ endif -+ - gstvpx = library('gstvpx', - vpx_sources, - c_args : gst_plugins_good_args + vpx_args, |