diff options
Diffstat (limited to 'media-plugins/gst-plugins-openaptx')
| -rw-r--r-- | media-plugins/gst-plugins-openaptx/Manifest | 2 | ||||
| -rw-r--r-- | media-plugins/gst-plugins-openaptx/files/gst-plugins-openaptx-1.20.0-freeaptx.patch | 76 | ||||
| -rw-r--r-- | media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.1.ebuild (renamed from media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.0.ebuild) | 7 |
3 files changed, 2 insertions, 83 deletions
diff --git a/media-plugins/gst-plugins-openaptx/Manifest b/media-plugins/gst-plugins-openaptx/Manifest index 269dcd662f74..0a8595c5982c 100644 --- a/media-plugins/gst-plugins-openaptx/Manifest +++ b/media-plugins/gst-plugins-openaptx/Manifest @@ -1 +1 @@ -DIST gst-plugins-bad-1.20.0.tar.xz 6203880 BLAKE2B 3c2bcbd5e3af56497415ac9e32b91bf0f9ed0668d6992c8d14b2b56c86be2178ea93409e505d438b56fe87bf75a4c96554fd3cbf9ea5b204b2a520fccb6894fe SHA512 d79fedba96517c25d2ba3925405933671fa05e350b8e133277a7c1d509e08a49ceeb50c016e23e798667fa0b09783105914f06538bdcaae969fdba8ac385a51b +DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6 diff --git a/media-plugins/gst-plugins-openaptx/files/gst-plugins-openaptx-1.20.0-freeaptx.patch b/media-plugins/gst-plugins-openaptx/files/gst-plugins-openaptx-1.20.0-freeaptx.patch deleted file mode 100644 index 82602552838e..000000000000 --- a/media-plugins/gst-plugins-openaptx/files/gst-plugins-openaptx-1.20.0-freeaptx.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit acd0300485a49f2d5929252139011453e9611fe3 -Author: Jan Alexander Steffens (heftig) <heftig@archlinux.org> -Date: Tue Feb 8 15:22:39 2022 +0100 - - openaptx: Support libfreeaptx - - [libfreeaptx][1] is a fork of libopenapt 0.2.0, used by pipewire. - - [1]: https://github.com/iamthehorker/libfreeaptx - - Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1642 - Closes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1589 - Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1667> - -diff --git a/ext/openaptx/gstopenaptxdec.h b/ext/openaptx/gstopenaptxdec.h -index 95b126c57e..081b194fb5 100644 ---- a/ext/openaptx/gstopenaptxdec.h -+++ b/ext/openaptx/gstopenaptxdec.h -@@ -24,7 +24,11 @@ - #include <gst/gst.h> - #include <gst/audio/audio.h> - -+#ifdef USE_FREEAPTX -+#include <freeaptx.h> -+#else - #include <openaptx.h> -+#endif - - G_BEGIN_DECLS - -diff --git a/ext/openaptx/gstopenaptxenc.h b/ext/openaptx/gstopenaptxenc.h -index ab80b61b7c..4cf7e17b93 100644 ---- a/ext/openaptx/gstopenaptxenc.h -+++ b/ext/openaptx/gstopenaptxenc.h -@@ -24,7 +24,11 @@ - #include <gst/gst.h> - #include <gst/audio/audio.h> - -+#ifdef USE_FREEAPTX -+#include <freeaptx.h> -+#else - #include <openaptx.h> -+#endif - - G_BEGIN_DECLS - -diff --git a/ext/openaptx/meson.build b/ext/openaptx/meson.build -index e361ef3b6c..4db8fdbb15 100644 ---- a/ext/openaptx/meson.build -+++ b/ext/openaptx/meson.build -@@ -4,12 +4,23 @@ openaptx_sources = [ - 'gstopenaptxenc.c', - ] - --openaptx_dep = dependency('libopenaptx', version : '== 0.2.0', required : get_option('openaptx')) -+if not get_option('openaptx').allowed() -+ subdir_done() -+endif -+ -+openaptx_defines = [] -+ -+openaptx_dep = dependency('libfreeaptx', version : '>= 0.1.1', required : false) -+if openaptx_dep.found() -+ openaptx_defines += ['-DUSE_FREEAPTX'] -+else -+ openaptx_dep = dependency('libopenaptx', version : '== 0.2.0', required : get_option('openaptx')) -+endif - - if openaptx_dep.found() - gstopenaptx = library('gstopenaptx', - openaptx_sources, -- c_args : gst_plugins_bad_args, -+ c_args : gst_plugins_bad_args + openaptx_defines, - include_directories : [configinc], - dependencies : [gstaudio_dep, openaptx_dep], - install : true, diff --git a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.0.ebuild b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.1.ebuild index e7678a10357a..4bf400bc1a18 100644 --- a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.0.ebuild +++ b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.1.ebuild @@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson DESCRIPTION="openaptx plugin for GStreamer" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" RDEPEND=" || ( @@ -16,8 +16,3 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" - -# Fixes backported to 1.20.0, to be removed in 1.20.1 -PATCHES=( - "${FILESDIR}/gst-plugins-openaptx-1.20.0-freeaptx.patch" -) |