From c9c63edbde6aaf774d263036d4f14da25c88ed53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:48:11 +0200 Subject: gnu: gstreamer: Update to 1.16.0. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-bad, gst-plugins-ugly, python-gst): Update to 1.16.0. (gst-plugins-good): Likewise. [source](patches): Remove. [arguments]: Remove #:make-flags. (gst-libav): Update to 1.16.0. [inputs]: Change FFMPEG-3.4 to FFMPEG. * gnu/packages/patches/gst-plugins-good-libvpx-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- .../patches/gst-plugins-good-libvpx-compat.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 gnu/packages/patches/gst-plugins-good-libvpx-compat.patch (limited to 'gnu/packages/patches') 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, -- cgit v1.2.3 From ab43d1f827c13c8d2027358653b9deeeec29ff43 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:36:23 +0200 Subject: gnu: at-spi2-core: Update to 2.32.1. * gnu/packages/patches/at-spi2-core-meson-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.32.1. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 5 ++--- gnu/packages/patches/at-spi2-core-meson-compat.patch | 18 ------------------ 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/at-spi2-core-meson-compat.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index 2d3b8d32cb..09a165c26e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -666,7 +666,6 @@ dist_patch_DATA = \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ - %D%/packages/patches/at-spi2-core-meson-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f40277c716..ea5c0fa11a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -556,16 +556,15 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.32.0") + (version "2.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "at-spi2-core-meson-compat.patch")) (sha256 (base32 - "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923")))) + "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments 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' ], -- cgit v1.2.3