* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-good/files/, media-libs/gst-plugins-good/
@ 2022-03-08 13:48 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-03-08 13:48 UTC (permalink / raw
To: gentoo-commits
commit: cf1b18cbd8da5490ace34d387679c9f9242dea34
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Sat Feb 26 17:43:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 13:47:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1b18cb
media-libs/gst-plugins-good: Backport ldac payload fix to 1.20.0
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 163 +++++++++++++++++++++
.../gst-plugins-good-1.20.0.ebuild | 1 +
2 files changed, 164 insertions(+)
--git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
new file mode 100644
index 000000000000..f1fc4601a23a
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
@@ -0,0 +1,163 @@
+From cc3419daf60159394cd310c2405a78775b3f84db Mon Sep 17 00:00:00 2001
+From: Sanchayan Maity <sanchayan@asymptotic.io>
+Date: Thu, 24 Feb 2022 20:28:23 +0530
+Subject: [PATCH] rtp: ldac: Set frame count information in payload
+
+The RTP payload seems to be required as it carries the frame count
+information. Also, gst_rtp_base_payload_allocate_output_buffer had
+the second argument incorrect.
+
+Strangely some devices like Shanling MP4 and Sony XM3 would still
+work without this while some like the Sony XM4 do not.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1797>
+---
+ .../docs/gst_plugins_cache.json | 2 +-
+ .../gst-plugins-good/gst/rtp/gstrtpldacpay.c | 63 ++++++++++++++++++-
+ .../gst-plugins-good/gst/rtp/gstrtpldacpay.h | 1 +
+ 3 files changed, 62 insertions(+), 4 deletions(-)
+
+diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
+index 88bff47243..003546d59d 100644
+--- a/docs/gst_plugins_cache.json
++++ b/docs/gst_plugins_cache.json
+@@ -14678,7 +14678,7 @@
+ "long-name": "RTP packet payloader",
+ "pad-templates": {
+ "sink": {
+- "caps": "audio/x-ldac:\n channels: [ 1, 2 ]\n rate: { (int)44100, (int)48000, (int)88200, (int)96000 }\n",
++ "caps": "audio/x-ldac:\n channels: [ 1, 2 ]\n eqmid: { (int)0, (int)1, (int)2 }\n rate: { (int)44100, (int)48000, (int)88200, (int)96000 }\n",
+ "direction": "sink",
+ "presence": "always"
+ },
+diff --git a/gst/rtp/gstrtpldacpay.c b/gst/rtp/gstrtpldacpay.c
+index 2b14b746fe..aa30673e7e 100644
+--- a/gst/rtp/gstrtpldacpay.c
++++ b/gst/rtp/gstrtpldacpay.c
+@@ -48,7 +48,7 @@
+ #include "gstrtpldacpay.h"
+ #include "gstrtputils.h"
+
+-#define GST_RTP_HEADER_LENGTH 12
++#define GST_RTP_LDAC_PAYLOAD_HEADER_SIZE 1
+ /* MTU size required for LDAC A2DP streaming */
+ #define GST_LDAC_MTU_REQUIRED 679
+
+@@ -64,6 +64,7 @@ static GstStaticPadTemplate gst_rtp_ldac_pay_sink_factory =
+ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("audio/x-ldac, "
+ "channels = (int) [ 1, 2 ], "
++ "eqmid = (int) { 0, 1, 2 }, "
+ "rate = (int) { 44100, 48000, 88200, 96000 }")
+ );
+
+@@ -81,6 +82,38 @@ static gboolean gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload,
+ static GstFlowReturn gst_rtp_ldac_pay_handle_buffer (GstRTPBasePayload *
+ payload, GstBuffer * buffer);
+
++/**
++ * gst_rtp_ldac_pay_get_num_frames
++ * @eqmid: Encode Quality Mode Index
++ * @channels: Number of channels
++ *
++ * Returns: Number of LDAC frames per packet.
++ */
++static guint8
++gst_rtp_ldac_pay_get_num_frames (gint eqmid, gint channels)
++{
++ g_assert (channels == 1 || channels == 2);
++
++ switch (eqmid) {
++ /* Encode setting for High Quality */
++ case 0:
++ return 4 / channels;
++ /* Encode setting for Standard Quality */
++ case 1:
++ return 6 / channels;
++ /* Encode setting for Mobile use Quality */
++ case 2:
++ return 12 / channels;
++ default:
++ break;
++ }
++
++ g_assert_not_reached ();
++
++ /* If assertion gets compiled out */
++ return 6 / channels;
++}
++
+ static void
+ gst_rtp_ldac_pay_class_init (GstRtpLdacPayClass * klass)
+ {
+@@ -115,7 +148,7 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
+ {
+ GstRtpLdacPay *ldacpay = GST_RTP_LDAC_PAY (payload);
+ GstStructure *structure;
+- gint rate;
++ gint channels, eqmid, rate;
+
+ if (GST_RTP_BASE_PAYLOAD_MTU (ldacpay) < GST_LDAC_MTU_REQUIRED) {
+ GST_ERROR_OBJECT (ldacpay, "Invalid MTU %d, should be >= %d",
+@@ -129,6 +162,18 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
+ return FALSE;
+ }
+
++ if (!gst_structure_get_int (structure, "channels", &channels)) {
++ GST_ERROR_OBJECT (ldacpay, "Failed to get audio rate from caps");
++ return FALSE;
++ }
++
++ if (!gst_structure_get_int (structure, "eqmid", &eqmid)) {
++ GST_ERROR_OBJECT (ldacpay, "Failed to get eqmid from caps");
++ return FALSE;
++ }
++
++ ldacpay->frame_count = gst_rtp_ldac_pay_get_num_frames (eqmid, channels);
++
+ gst_rtp_base_payload_set_options (payload, "audio", TRUE, "X-GST-LDAC", rate);
+
+ return gst_rtp_base_payload_set_outcaps (payload, NULL);
+@@ -145,14 +190,26 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
+ static GstFlowReturn
+ gst_rtp_ldac_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer)
+ {
++ GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
+ GstRtpLdacPay *ldacpay = GST_RTP_LDAC_PAY (payload);
+ GstBuffer *outbuf;
+ GstClockTime outbuf_frame_duration, outbuf_pts;
++ guint8 *payload_data;
+ gsize buf_sz;
+
+ outbuf =
+ gst_rtp_base_payload_allocate_output_buffer (GST_RTP_BASE_PAYLOAD
+- (ldacpay), GST_RTP_HEADER_LENGTH, 0, 0);
++ (ldacpay), GST_RTP_LDAC_PAYLOAD_HEADER_SIZE, 0, 0);
++
++ /* Get payload */
++ gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
++
++ /* Write header and copy data into payload */
++ payload_data = gst_rtp_buffer_get_payload (&rtp);
++ /* Upper 3 fragment bits not used, ref A2DP v13, 4.3.4 */
++ payload_data[0] = ldacpay->frame_count & 0x0f;
++
++ gst_rtp_buffer_unmap (&rtp);
+
+ outbuf_pts = GST_BUFFER_PTS (buffer);
+ outbuf_frame_duration = GST_BUFFER_DURATION (buffer);
+diff --git a/gst/rtp/gstrtpldacpay.h b/gst/rtp/gstrtpldacpay.h
+index 0865ce7ade..0134491752 100644
+--- a/gst/rtp/gstrtpldacpay.h
++++ b/gst/rtp/gstrtpldacpay.h
+@@ -42,6 +42,7 @@ typedef struct _GstRtpLdacPayClass GstRtpLdacPayClass;
+
+ struct _GstRtpLdacPay {
+ GstRTPBasePayload base;
++ guint8 frame_count;
+ };
+
+ struct _GstRtpLdacPayClass {
+--
+GitLab
+
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.0.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.0.ebuild
index 82182c710194..d696e4023d0c 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.20.0.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.0.ebuild
@@ -27,6 +27,7 @@ DOCS=( AUTHORS ChangeLog NEWS README RELEASE )
# Fixes backported to 1.20.0, to be removed in 1.20.1+
PATCHES=(
"${FILESDIR}/gst-plugins-good-1.20.0-lame-feature-option.patch"
+ "${FILESDIR}/gst-plugins-good-1.20.0-ldac-rtp-header.patch"
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-good/files/, media-libs/gst-plugins-good/
@ 2021-02-20 9:36 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2021-02-20 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 09b83e780819ead985f33ea3101e4553e6674b8e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 09:34:26 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 09:36:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b83e78
media-libs/gst-plugins-good: remove old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/gst-plugins-good/Manifest | 2 -
.../files/gst-plugins-good-1.14.5-make43.patch | 56 ---------------------
.../files/gst-plugins-good-1.16.2-make43.patch | 57 ----------------------
.../gst-plugins-good-1.14.5.ebuild | 54 --------------------
.../gst-plugins-good-1.16.2.ebuild | 54 --------------------
5 files changed, 223 deletions(-)
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 28ae66bf58c..d9332200d73 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1 @@
-DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
deleted file mode 100644
index 2429bf2b000..00000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
-
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,13 +1,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
-
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/sys/v4l2/Makefile.in
-+++ b/sys/v4l2/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -669,7 +671,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- plugin_LTLIBRARIES = libgstvideo4linux2.la
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstvideo4linux2_la_SOURCES = gstv4l2.c \
- gstv4l2allocator.c \
- gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
deleted file mode 100644
index b7e43f35c2a..00000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
-
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,13 +1,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
- #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
-
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/sys/v4l2/Makefile.in
-+++ b/sys/v4l2/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
-
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -669,7 +671,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- plugin_LTLIBRARIES = libgstvideo4linux2.la
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstvideo4linux2_la_SOURCES = gstv4l2.c \
- gstv4l2allocator.c \
- gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
deleted file mode 100644
index cf5aec755cc..00000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+orc"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
- >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
- # Always enable optional bz2 support for matroska
- # Always enable optional zlib support for qtdemux and matroska
- # Many media files require these to work, as some container headers are often
- # compressed, bug #291154
- gstreamer_multilib_src_configure \
- --enable-bz2 \
- --enable-zlib \
- --disable-examples \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/plugins/html docs/plugins/html || die
- fi
-
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
deleted file mode 100644
index 38c26b5161b..00000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+orc"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
- >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
- # Always enable optional bz2 support for matroska
- # Always enable optional zlib support for qtdemux and matroska
- # Many media files require these to work, as some container headers are often
- # compressed, bug #291154
- gstreamer_multilib_src_configure \
- --enable-bz2 \
- --enable-zlib \
- --disable-examples \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/plugins/html docs/plugins/html || die
- fi
-
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-good/files/, media-libs/gst-plugins-good/
@ 2020-03-18 11:22 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-03-18 11:22 UTC (permalink / raw
To: gentoo-commits
commit: f48af75c6ad428800177a91a510731a0488a233f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:22:19 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:22:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48af75c
media-libs/gst-plugins-good: Fix for >=make-4.3
Closes: https://bugs.gentoo.org/705974
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/gst-plugins-good-1.14.5-make43.patch | 56 ++++++++++++++++++++++
.../gst-plugins-good-1.14.5.ebuild | 4 ++
2 files changed, 60 insertions(+)
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
new file mode 100644
index 00000000000..2429bf2b000
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
@@ -0,0 +1,56 @@
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,13 +1,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+--- a/sys/v4l2/Makefile.in
++++ b/sys/v4l2/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -669,7 +671,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ plugin_LTLIBRARIES = libgstvideo4linux2.la
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgstvideo4linux2_la_SOURCES = gstv4l2.c \
+ gstv4l2allocator.c \
+ gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index 112f1972ea1..94dfa129e9d 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.12
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
+)
+
multilib_src_configure() {
# Always enable optional bz2 support for matroska
# Always enable optional zlib support for qtdemux and matroska
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-08 13:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-08 13:48 [gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-good/files/, media-libs/gst-plugins-good/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-02-20 9:36 Mart Raudsepp
2020-03-18 11:22 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox