[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2024-04-30 Thread Mart Raudsepp 
commit: 15881aaf14c79dc8bd18060646ec2d69e556fd07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Apr 30 07:50:05 2024 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Apr 30 08:23:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15881aaf

media-libs/gstreamer: drop 1.20.5, 1.20.6

Bug: https://bugs.gentoo.org/917791
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-libs/gstreamer/Manifest  |   2 -
 .../files/gstreamer-1.20.5-tests-race.patch| 293 -
 media-libs/gstreamer/gstreamer-1.20.5.ebuild   |  76 --
 media-libs/gstreamer/gstreamer-1.20.6.ebuild   |  72 -
 4 files changed, 443 deletions(-)

diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 0240c9b8ad80..4e39f93eb248 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1 @@
-DIST gstreamer-1.20.5.tar.xz 2690968 BLAKE2B 
cca6385b1fcc10928ad19e587ebb6ce202097f4a33d79555c969d3906dacc7e5074fc8f42a0566e40aa333502764ad0b491d610c05ef1921ad370bf5f5883afd
 SHA512 
90c5f5865877170bb0dc570e61c22c27dea5adae2d9c304227da266b5b5b2eccd98ed21943f14bb5dfe169f4e020b8ac457a5d540363dfe2547180f34a3c7b29
-DIST gstreamer-1.20.6.tar.xz 2699648 BLAKE2B 
e475a7ef419d1b3588bf37f3d5fadbe4ca307b6915496d8da9535a9586f24ddacd338e54001ce30c666786493b28c2841c8a7fc8a36e5a678d846eeccc3979dc
 SHA512 
eefd2932feb6c6c50eb69dd4831f4e4fe63c7f852050ddce0f447b0b54df2e2e5f81b6c1fefe295e2c771f2accef62aaef6aef3bda8395a1b75c84b9916d7795
 DIST gstreamer-1.22.11.tar.xz 1801248 BLAKE2B 
856342994bc8750598cb256313151355e7c58d751214c168c53ba831cfcdf3ab789a192473ba0e0645df8cb7cb9e625348b18cfe83d839f1f231f8f746877f49
 SHA512 
8976cebd2cbac3ef31ee6163d2c5264be7d10d54ab9fe6f0b2317d7d0380420ef2378e1b476af09f1e6b203e3eafcda88fc08bb2f550a6f411d8670dec04843e

diff --git a/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch 
b/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch
deleted file mode 100644
index 05b183ec3054..
--- a/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-https://bugs.gentoo.org/888986
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/ccd582c3321312fe96b28ce90fe6f2fd7adfa058
-
-From ccd582c3321312fe96b28ce90fe6f2fd7adfa058 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= 
-Date: Tue, 21 Jun 2022 11:51:35 +0300
-Subject: [PATCH] bin: Fix race conditions in tests
-
-The latency messages are non-deterministic and can arrive before/after
-async-done or during state-changes as they are posted by e.g. sinks from
-their streaming thread but bins are finishing asynchronous state changes
-from a secondary helper thread.
-
-To solve this, expect latency messages at any time and assert that we
-receive one at some point during the test.
-
-Part-of: 

 a/tests/check/gst/gstbin.c
-+++ b/tests/check/gst/gstbin.c
-@@ -27,50 +27,95 @@
- #include 
- 
- static void
--pop_async_done (GstBus * bus)
-+pop_async_done (GstBus * bus, gboolean * had_latency)
- {
-   GstMessage *message;
-+  GstMessageType types = GST_MESSAGE_ASYNC_DONE;
-+
-+  if (!*had_latency)
-+types |= GST_MESSAGE_LATENCY;
- 
-   GST_DEBUG ("popping async-done message");
--  message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1);
- 
--  fail_unless (message && GST_MESSAGE_TYPE (message)
--  == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE");
-+  do {
-+message = gst_bus_poll (bus, types, -1);
- 
--  gst_message_unref (message);
--  GST_DEBUG ("popped message");
-+fail_unless (message);
-+GST_DEBUG ("popped message %s",
-+gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
-+
-+if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) {
-+  fail_unless (*had_latency == FALSE);
-+  *had_latency = TRUE;
-+  gst_clear_message (&message);
-+  types &= ~GST_MESSAGE_LATENCY;
-+  continue;
-+}
-+
-+fail_unless (GST_MESSAGE_TYPE (message)
-+== GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE");
-+
-+gst_clear_message (&message);
-+break;
-+  } while (TRUE);
- }
- 
- static void
--pop_latency (GstBus * bus)
-+pop_latency (GstBus * bus, gboolean * had_latency)
- {
-   GstMessage *message;
- 
--  GST_DEBUG ("popping async-done message");
-+  if (*had_latency)
-+return;
-+
-+  GST_DEBUG ("popping latency message");
-   message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1);
- 
--  fail_unless (message && GST_MESSAGE_TYPE (message)
-+  fail_unless (message);
-+  fail_unless (GST_MESSAGE_TYPE (message)
-   == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY");
- 
--  gst_message_unref (message);
--  GST_DEBUG ("popped message");
-+  GST_DEBUG ("popped message %s",
-+  gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
-+  gst_clear_message (&message);
-+
-+  *had_latency = TRU

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2023-01-28 Thread Sam James 
commit: 2c57b02687ae18efdc6638b6562e6472167b6e8a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 29 07:29:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 29 07:33:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c57b026

media-libs/gstreamer: backport race condition fix for tests

Closes: https://bugs.gentoo.org/888986
Signed-off-by: Sam James  gentoo.org>

 .../files/gstreamer-1.20.5-tests-race.patch| 293 +
 media-libs/gstreamer/gstreamer-1.20.5.ebuild   |   1 +
 2 files changed, 294 insertions(+)

diff --git a/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch 
b/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch
new file mode 100644
index ..05b183ec3054
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-1.20.5-tests-race.patch
@@ -0,0 +1,293 @@
+https://bugs.gentoo.org/888986
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/ccd582c3321312fe96b28ce90fe6f2fd7adfa058
+
+From ccd582c3321312fe96b28ce90fe6f2fd7adfa058 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= 
+Date: Tue, 21 Jun 2022 11:51:35 +0300
+Subject: [PATCH] bin: Fix race conditions in tests
+
+The latency messages are non-deterministic and can arrive before/after
+async-done or during state-changes as they are posted by e.g. sinks from
+their streaming thread but bins are finishing asynchronous state changes
+from a secondary helper thread.
+
+To solve this, expect latency messages at any time and assert that we
+receive one at some point during the test.
+
+Part-of: 

+--- a/tests/check/gst/gstbin.c
 b/tests/check/gst/gstbin.c
+@@ -27,50 +27,95 @@
+ #include 
+ 
+ static void
+-pop_async_done (GstBus * bus)
++pop_async_done (GstBus * bus, gboolean * had_latency)
+ {
+   GstMessage *message;
++  GstMessageType types = GST_MESSAGE_ASYNC_DONE;
++
++  if (!*had_latency)
++types |= GST_MESSAGE_LATENCY;
+ 
+   GST_DEBUG ("popping async-done message");
+-  message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1);
+ 
+-  fail_unless (message && GST_MESSAGE_TYPE (message)
+-  == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE");
++  do {
++message = gst_bus_poll (bus, types, -1);
+ 
+-  gst_message_unref (message);
+-  GST_DEBUG ("popped message");
++fail_unless (message);
++GST_DEBUG ("popped message %s",
++gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
++
++if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) {
++  fail_unless (*had_latency == FALSE);
++  *had_latency = TRUE;
++  gst_clear_message (&message);
++  types &= ~GST_MESSAGE_LATENCY;
++  continue;
++}
++
++fail_unless (GST_MESSAGE_TYPE (message)
++== GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE");
++
++gst_clear_message (&message);
++break;
++  } while (TRUE);
+ }
+ 
+ static void
+-pop_latency (GstBus * bus)
++pop_latency (GstBus * bus, gboolean * had_latency)
+ {
+   GstMessage *message;
+ 
+-  GST_DEBUG ("popping async-done message");
++  if (*had_latency)
++return;
++
++  GST_DEBUG ("popping latency message");
+   message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1);
+ 
+-  fail_unless (message && GST_MESSAGE_TYPE (message)
++  fail_unless (message);
++  fail_unless (GST_MESSAGE_TYPE (message)
+   == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY");
+ 
+-  gst_message_unref (message);
+-  GST_DEBUG ("popped message");
++  GST_DEBUG ("popped message %s",
++  gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
++  gst_clear_message (&message);
++
++  *had_latency = TRUE;
+ }
+ 
+ static void
+-pop_state_changed (GstBus * bus, int count)
++pop_state_changed (GstBus * bus, int count, gboolean * had_latency)
+ {
+   GstMessage *message;
+-
++  GstMessageType types = GST_MESSAGE_STATE_CHANGED;
+   int i;
+ 
++  if (!*had_latency)
++types |= GST_MESSAGE_LATENCY;
++
+   GST_DEBUG ("popping %d messages", count);
+   for (i = 0; i < count; ++i) {
+-message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1);
+-
+-fail_unless (message && GST_MESSAGE_TYPE (message)
+-== GST_MESSAGE_STATE_CHANGED, "did not get 
GST_MESSAGE_STATE_CHANGED");
+-
+-gst_message_unref (message);
++do {
++  message = gst_bus_poll (bus, types, -1);
++
++  fail_unless (message);
++  GST_DEBUG ("popped message %s",
++  gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
++
++  if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) {
++fail_unless (*had_latency == FALSE);
++*had_latency = TRUE;
++gst_clear_message (&message);
++types &= ~GST_MESSAGE_LATENCY;
++continue;
++  }
++
++  fail_unless (GST_MESSAGE_TYPE (message)
++  == GST_MESSAGE_STATE_CHANGED,
++  "did not get GST_MESSAGE_STATE_CHANGED");
++
++  gst_message_unref (m

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/

2022-11-20 Thread Mart Raudsepp 
commit: 029ddd74431eb0b93a222ccc8ac85fa263df8af5
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Nov 20 18:50:32 2022 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Nov 20 18:50:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029ddd74

media-libs/gstreamer: drop leftover patch file

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gstreamer/files/gstreamer-1.20-loong.patch | 28 --
 1 file changed, 28 deletions(-)

diff --git a/media-libs/gstreamer/files/gstreamer-1.20-loong.patch 
b/media-libs/gstreamer/files/gstreamer-1.20-loong.patch
deleted file mode 100644
index 833c217ca829..
--- a/media-libs/gstreamer/files/gstreamer-1.20-loong.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2443,
-with file path tweaked to suit dist tarball layout.
-
-From: WANG Xuerui 
-Date: Wed, 18 May 2022 10:04:08 +0800
-Subject: [PATCH] gstreamer/gst/gstconfig.h.in: Add support for LoongArch
-
-While current and future LoongArch machines that are supposed to run
-GStreamer all support unaligned accesses, there might be future
-lower-end cores (e.g. the embedded product line) without such support,
-and we may not want to penalize these use cases.
-
-So, mark LoongArch as not supporting unaligned accesses for now, and
-hope the compilers do a good job optimizing them. We can always flip
-switch later.
-
-Suggested-by: CHEN Tao 
 a/gst/gstconfig.h.in
-+++ b/gst/gstconfig.h.in
-@@ -124,7 +124,7 @@
-  * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6
-  * https://software.intel.com/en-us/node/583402
-  */
--#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || 
defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || 
defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || 
defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) 
|| defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || 
defined(_M_ARM) || defined(_M_ARM64) || defined(_M_IA64) || defined(__xtensa__) 
|| defined(__e2k__) || defined(__riscv) || defined(__ARC64__) 
-+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || 
defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || 
defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || 
defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) 
|| defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || 
defined(_M_ARM) || defined(_M_ARM64) || defined(_M_IA64) || defined(__xtensa__) 
|| defined(__e2k__) || defined(__riscv) || defined(__ARC64__) || 
defined(__loongarch__)
- #  define GST_HAVE_UNALIGNED_ACCESS 0
- #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || 
defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || 
defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || 
defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) 
|| defined(__s390__) || defined(__s390x__) || defined(__zarch__)
- #  define GST_HAVE_UNALIGNED_ACCESS 1

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2020-03-18 Thread David Seifert 
commit: d26d94695c46be522bea60762c7f4a0a47e6778b
Author: David Seifert  gentoo  org>
AuthorDate: Wed Mar 18 11:22:10 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Mar 18 11:22:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26d9469

media-libs/gstreamer: 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  gentoo.org>

 .../gstreamer/files/gstreamer-1.14.5-make43.patch  | 84 ++
 media-libs/gstreamer/gstreamer-1.14.5.ebuild   |  1 +
 2 files changed, 85 insertions(+)

diff --git a/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch 
b/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch
new file mode 100644
index 000..e22cc9f8b45
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch
@@ -0,0 +1,84 @@
+--- 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,14 +1,16 @@
+ # 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 
++#glib_gen_decl_include=$(H)include 
+ 
+-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/libs/gst/controller/Makefile.in
 b/libs/gst/controller/Makefile.in
+@@ -17,13 +17,6 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
+-#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 
+-
+ 
+ 
+ VPATH = @srcdir@
+@@ -550,11 +543,12 @@
+   gstinterpolationcontrolsource.h \
+   gstlfocontrolsource.h
+ 
++H := \#
+ glib_enum_define = GST_CONTROLLER
+ glib_gen_prefix = gst
+ glib_gen_basename = controller
+ glib_gen_decl_banner = GST_CONTROLLER_API
+-glib_gen_decl_include = \#include 
++glib_gen_decl_include = $(H)include 
+ built_sources = controller-enumtypes.c
+ built_headers = controller-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+@@ -587,7 +581,14 @@
+ libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
+ libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) 
$(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+ CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(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=$(H)include 
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = 
GstController-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@ 
$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \

diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild 
b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index 3de3bd8ed03..d1e6df24377 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+   "${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and 
switching to Meson
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2019-08-25 Thread Mart Raudsepp 
commit: 8b160c7a4ec1f63d76c9cb0781a0c26e4d8194d6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Aug 25 18:00:46 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Aug 25 18:01:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b160c7a

media-libs/gstreamer: fix gsturi test with glib-2.60

Closes: https://bugs.gentoo.org/690940
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/1.14-glib-2.60-tests-compat.patch| 56 ++
 media-libs/gstreamer/gstreamer-1.14.4.ebuild   |  4 ++
 2 files changed, 60 insertions(+)

diff --git a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch 
b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
new file mode 100644
index 000..ca74bf0cc2e
--- /dev/null
+++ b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
@@ -0,0 +1,56 @@
+From 4a7739f4b6442814696bbd0706ab9a1ce1462d80 Mon Sep 17 00:00:00 2001
+From: Havard Graff 
+Date: Wed, 31 Oct 2018 10:27:23 +0100
+Subject: [PATCH] tests/uri: fix test after GHashTable changes in GLib 2.59
+
+Maybe the implementation should not be dependent on a "random" hash-table
+ordering, but at least this shows the problem clearly.
+---
+ tests/check/gst/gsturi.c | 16 +++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
+index ee623dbcf..fa87c7c77 100644
+--- a/tests/check/gst/gsturi.c
 b/tests/check/gst/gsturi.c
+@@ -414,7 +414,11 @@ static const struct URITest url_presenting_tests[] = {
+   {.uri = {"scheme", "user:pass", "host", 1234, "/path/to/dir",
+   {{"query", NULL}, {"key", "value"}}, "fragment"},
+   .str =
++#if GLIB_CHECK_VERSION(2, 59, 0)
++  "scheme://user:pass@host:1234/path/to/dir?key=value&query#fragment"},
++#else
+   "scheme://user:pass@host:1234/path/to/dir?query&key=value#fragment"},
++#endif
+ 
+   /* IPv6 literal should render in square brackets */
+   {.uri = {"scheme", "user:pass", "12:34:56:78:9a:bc:de:f0", 1234,
+@@ -977,14 +981,24 @@ GST_START_TEST (test_url_get_set)
+ 
+   fail_unless (gst_uri_set_query_value (url, "key", "value"));
+   tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++  fail_unless_equals_string (tmp_str,
++ "//example.com/path/to/file/there/segment?key=value&query#fragment");
++#else
+   fail_unless_equals_string (tmp_str,
+-  "//example.com/path/to/file/there/segment?query&key=value#fragment");
++ "//example.com/path/to/file/there/segment?query&key=value#fragment");
++#endif
+   g_free (tmp_str);
+ 
+   fail_unless (gst_uri_set_query_value (url, "key", NULL));
+   tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++  fail_unless_equals_string (tmp_str,
++  "//example.com/path/to/file/there/segment?key&query#fragment");
++#else
+   fail_unless_equals_string (tmp_str,
+   "//example.com/path/to/file/there/segment?query&key#fragment");
++#endif
+   g_free (tmp_str);
+ 
+   fail_unless (!gst_uri_set_query_value (NULL, "key", "value"));
+-- 
+2.20.1
+

diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild 
b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 7bb095742b0..19677ed3d4f 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 "
 # gtk-doc-am to install API docs
 
+PATCHES=(
+   "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+)
+
 src_configure() {
if [[ ${CHOST} == *-interix* ]] ; then
export ac_cv_lib_dl_dladdr=no

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/

2017-09-18 Thread Mart Raudsepp 
commit: 5bb476c6460ddc23ee59946efd3f4d2b6e6f502f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Sep 18 20:26:25 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Sep 18 20:26:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb476c6

media-libs/gstreamer: remove stale patch

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/gstreamer-1.12.2-automagic.patch | 168 -
 1 file changed, 168 deletions(-)

diff --git a/media-libs/gstreamer/files/gstreamer-1.12.2-automagic.patch 
b/media-libs/gstreamer/files/gstreamer-1.12.2-automagic.patch
deleted file mode 100644
index 98d504579ef..000
--- a/media-libs/gstreamer/files/gstreamer-1.12.2-automagic.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From e7c33f24ed43189c84cc3a31260ad4963a6bb9c7 Mon Sep 17 00:00:00 2001
-From: Edward Hervey 
-Date: Tue, 11 Jul 2017 15:29:44 +0200
-Subject: [PATCH 1/3] pkgconfig: Add private requirements
-
-Add libunwind and dw to the .pc Requires.private. Fixes static library
-compilation if gstreamer was compiled with one of those dependencies
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784795

- configure.ac  | 4 
- pkgconfig/gstreamer-uninstalled.pc.in | 2 +-
- pkgconfig/gstreamer.pc.in | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b6b2923..de9fcae 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -824,12 +824,16 @@ dnl libunwind is optionally used by the leaks tracer
- PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
- if test "x$HAVE_UNWIND" = "xyes"; then
-   AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
-+  UNWIND_REQUIRE=libunwind
-+  AC_SUBST(UNWIND_REQUIRE)
- fi
- 
- dnl libdw is optionally used to add source lines and numbers to backtraces
- PKG_CHECK_MODULES(DW, libdw, HAVE_DW=yes, HAVE_DW=no)
- if test "x$HAVE_DW" = "xyes"; then
-   AC_DEFINE(HAVE_DW, 1, [libdw available])
-+  DW_REQUIRE=libdw
-+  AC_SUBST(DW_REQUIRE)
- fi
- 
- dnl Check for backtrace() from libc
-diff --git a/pkgconfig/gstreamer-uninstalled.pc.in 
b/pkgconfig/gstreamer-uninstalled.pc.in
-index b8dcdf8..d071612 100644
 a/pkgconfig/gstreamer-uninstalled.pc.in
-+++ b/pkgconfig/gstreamer-uninstalled.pc.in
-@@ -15,6 +15,6 @@ Name: GStreamer Uninstalled
- Description: Streaming media framework, Not Installed
- Version: @VERSION@
- Requires: glib-2.0, gobject-2.0
--Requires.private: gmodule-no-export-2.0
-+Requires.private: gmodule-no-export-2.0 @UNWIND_REQUIRE@ @DW_REQUIRE@
- Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
- Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ 
-I@abs_top_builddir@/libs
-diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in
-index b949d6c..6ec3cb7 100644
 a/pkgconfig/gstreamer.pc.in
-+++ b/pkgconfig/gstreamer.pc.in
-@@ -13,6 +13,6 @@ Name: GStreamer
- Description: Streaming media framework
- Version: @VERSION@
- Requires: glib-2.0, gobject-2.0
--Requires.private: gmodule-no-export-2.0
-+Requires.private: gmodule-no-export-2.0 @UNWIND_REQUIRE@ @DW_REQUIRE@
- Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
- Cflags: -I${includedir}
--- 
-2.10.2
-
-
-From 1c7f9a5025b7ec0b7cfed701e2a3681a2d2afe74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= 
-Date: Tue, 11 Jul 2017 16:15:16 +0100
-Subject: [PATCH 2/3] meson: pkgconfig: add libunwind/libdw to gstreamer-1.0
- Requires.private
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784795

- pkgconfig/meson.build | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index 32f96cd..ae27ce3 100644
 a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
-@@ -7,6 +7,10 @@ pkgconf.set('includedir', 
'${prefix}/@0@'.format(get_option('includedir')))
- pkgconf.set('GST_API_VERSION', apiversion)
- pkgconf.set('VERSION', gst_version)
- 
-+# Requires.private
-+pkgconf.set('UNWIND_REQUIRE', cdata.has('HAVE_UNWIND') ? 'libunwind' : '')
-+pkgconf.set('DW_REQUIRE', cdata.has('HAVE_DW') ? 'libdw' : '')
-+
- # needed for generating -uninstalled.pc files
- pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..'))
- pkgconf.set('abs_top_srcdir', join_paths(meson.current_source_dir(), '..'))
--- 
-2.10.2
-
-
-From 2d358f8a4ab52574291927c7061109a74e8d12d7 Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani 
-Date: Fri, 11 Aug 2017 21:17:06 +0200
-Subject: [PATCH 3/3] configure: Add switches for enabling/disabling libdw and
- libunwind
-
-https://bugzilla.gnome.org/show_bug.cgi?id=778193

- configure.ac | 46 --
- 1 file changed, 36 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index de9fcae..6e0019a 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -821,19 +821,45 @@ fi
- AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
- 
- dnl libunwind is optionally used by the leaks tr

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2017-01-25 Thread Mart Raudsepp 
commit: da8b7bad7890541869742903ecd25339e95569b7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Jan 26 05:17:48 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Jan 26 05:17:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8b7bad

media-libs/gstreamer: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/gstreamer/Manifest  |   2 -
 .../files/gstreamer-1.6.3-fix-strsignal.patch  |  32 --
 media-libs/gstreamer/gstreamer-1.6.3.ebuild| 110 -
 media-libs/gstreamer/gstreamer-1.8.2.ebuild| 101 ---
 4 files changed, 245 deletions(-)

diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 086fe15..3ce503d 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,4 +1,2 @@
 DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 
9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 
7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
 WHIRLPOOL 
03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93
-DIST gstreamer-1.6.3.tar.xz 3553256 SHA256 
22f9568d67b87cf700a111f381144bd37cb93790a77e4e331db01fe854a37f24 SHA512 
f5ab2461469d489da956a0dd4e785e8f0a130b104a37289f7821be6e8f8e5049864888fdcf3a7d281406bf48b40737afa75347c22e6bec05ff2cf525734b51f7
 WHIRLPOOL 
386efbe1f431e247e11f7369ababb8bb5f2d457b046de1eb955cb9d2322f995c862b22124efcbeeeb9b4d25def664de952b98fe54ba71cd2438502e86ac1db7c
-DIST gstreamer-1.8.2.tar.xz 3609500 SHA256 
9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341 SHA512 
135d0a389fee3a9ebbd9df646c2d77affa4681721c4215dc6edd23be91d86c83f32c80498c37fcd19d97b3e534e6c45a96c3aa2650155696ca756bbeb7271b15
 WHIRLPOOL 
09836f8cca9aa9e10ac1758497c7b020357ab8b359dd309be9997f86252f8a32e665bed6adfa2c506175f70701ba809b164dad81d37b27a2adea09960d0e328a
 DIST gstreamer-1.8.3.tar.xz 3711068 SHA256 
66b37762d4fdcd63bce5a2bec57e055f92420e95037361609900278c0db7c53f SHA512 
a5f0c2b1d16fd03e3bd3968a8304ed1c32a5b733440cd656ab2e0caabb2f7803ae1bfe7a8e331d5ebb1e8adbe21c5c47263bc73a8480bc16cc28f995241e9f4e
 WHIRLPOOL 
8581d57e65f77b918ed98614e96726629c36c59e07700a32983482c16e0e40775351309465c55c4994fb830ca3044f9f74de05b673a63eeea53d1dc511a9b2ef

diff --git a/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch 
b/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
deleted file mode 100644
index 9d717e8..
--- a/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream split this one commit into two: c9da8b0 and d6e25dd because
-of some confusion.  I've recombined it here.  See:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=763567
-https://bugs.gentoo.org/show_bug.cgi?id=577312
-
-diff --git a/libs/gst/check/libcheck/strsignal.c 
b/libs/gst/check/libcheck/strsignal.c
-index b79409b..57e71cd 100644
 a/libs/gst/check/libcheck/strsignal.c
-+++ b/libs/gst/check/libcheck/strsignal.c
-@@ -1,6 +1,6 @@
- #include "libcompat.h"
- 
--const char *
-+char *
- strsignal (int sig)
- {
-   static char signame[40];
-
-diff --git a/libs/gst/check/libcheck/libcompat.h 
b/libs/gst/check/libcheck/libcompat.h
-index 32f944c..f09289b 100644
 a/libs/gst/check/libcheck/libcompat.h
-+++ b/libs/gst/check/libcheck/libcompat.h
-@@ -101,7 +101,7 @@ CK_DLL_EXP char *strdup (const char *str);
- #endif /* !HAVE_DECL_STRDUP && HAVE__STRDUP */
- 
- #if !HAVE_DECL_STRSIGNAL
--CK_DLL_EXP const char *strsignal (int sig);
-+CK_DLL_EXP char *strsignal (int sig);
- #endif /* !HAVE_DECL_STRSIGNAL */
- 
- /*

diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild 
b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
deleted file mode 100644
index fd465ed..
--- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils multilib multilib-minimal pax-utils
-
-# yes the manifest code should get fixed
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/";
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz";
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps +introspection nls +orc test"
-
-RDEPEND="
-   >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-   caps? ( sys-libs/libcap )
-   introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   >=dev-util/gtk-doc-am-1.12
-   sys-devel/bison
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/gstreamer/files/, media-libs/gstreamer/

2016-05-10 Thread Anthony G. Basile 
commit: a5b3ac3122541498c65575114ee2baa2fc43c849
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue May 10 23:38:49 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue May 10 23:39:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b3ac31

Revert "media-libs/gstreamer: fix bug #577312"

This reverts commit f59f39fb234fe5ce1c2a4c1c63be575fa494302c.

The gstreamer folks made a mistake in backporting this form libcheck.

See https://bugzilla.gnome.org/show_bug.cgi?id=763567#c12

 .../files/gstreamer-1.6.3-fix-strsignal.patch  | 29 --
 media-libs/gstreamer/gstreamer-1.6.3.ebuild|  4 ---
 2 files changed, 33 deletions(-)

diff --git a/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch 
b/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
deleted file mode 100644
index e237f9b..000
--- a/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c9da8b0e7f53005ab125e48165dae39fbfee2352 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" 
-Date: Sun, 13 Mar 2016 11:05:29 -0400
-Subject: libcompat.h: strsignal() should be not be decleared const
-
-POSIX standards requires strsignal() to return a pointer to a char,
-not a const pointer to a char. [1]  On uClibc, and possibly other
-libc's, that do not HAVE_DECL_STRSIGNAL, libcompat.h declares
-const char *strsignal (int sig) which causes a type error.
-
-[1] man 3 strsignal
-
-https://bugzilla.gnome.org/show_bug.cgi?id=763567
-
-diff --git a/libs/gst/check/libcheck/strsignal.c 
b/libs/gst/check/libcheck/strsignal.c
-index b79409b..57e71cd 100644
 a/libs/gst/check/libcheck/strsignal.c
-+++ b/libs/gst/check/libcheck/strsignal.c
-@@ -1,6 +1,6 @@
- #include "libcompat.h"
- 
--const char *
-+char *
- strsignal (int sig)
- {
-   static char signame[40];
--- 
-cgit v0.10.2
-

diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild 
b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
index 63ff72f..3b77847 100644
--- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 "
 # gtk-doc-am to install API docs
 
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-strsignal.patch #577312
-}
-
 src_configure() {
if [[ ${CHOST} == *-interix* ]] ; then
export ac_cv_lib_dl_dladdr=no