From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022

---
 media-libs/gavl/Manifest                     |  5 +++--
 media-libs/gavl/files/1.4.0-gnu_source.patch | 22 +++++++++++++++++++++
 media-libs/gavl/files/1.4.0-x32.diff         | 29 ----------------------------
 media-libs/gavl/files/1.4.0-x32.patch        | 29 ++++++++++++++++++++++++++++
 media-libs/gavl/gavl-1.4.0-r2.ebuild         |  7 +++++--
 5 files changed, 59 insertions(+), 33 deletions(-)
 create mode 100644 media-libs/gavl/files/1.4.0-gnu_source.patch
 delete mode 100644 media-libs/gavl/files/1.4.0-x32.diff
 create mode 100644 media-libs/gavl/files/1.4.0-x32.patch

(limited to 'media-libs/gavl')

diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 02f35ca96179..33b8bfe5675c 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,4 +1,5 @@
-AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
+AUX 1.4.0-gnu_source.patch 427 BLAKE2B d80d9e0371fd3d616a9c48481698ecdc3a40ddeebcaf7b04fd0d760c83de6c139d759f67f48f1b3c3a537d0f0bdde1bfa37244256ba22ead4332e831df832801 SHA512 2cdb6d76ab82ab8b4f12094cacab236b4096cb1067b5cf5bfeed58d29409e0eb91a2edbf45a9f9ebb539141c9de500752d5b2aa3fa59a23ee83c508d42f861a0
+AUX 1.4.0-x32.patch 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.4.0-r2.ebuild 1368 BLAKE2B 8573c21343c51ea56787089e71c08dd3b73b367669b3473efd9a69d9387eeedbd5459d6d2585550ebc6abfee662eaae4a69c37d912011b1bd0175966f46e04fb SHA512 485a180770ab23b6fc2cb83584294bdc5d7bceec4343ef89297d68b2afb47d2c4250a653b2a463b2df6dfbc3155c442d871d89cfc2700aa31ac8c240ae1f546a
+EBUILD gavl-1.4.0-r2.ebuild 1408 BLAKE2B 615c813541fed1869f09fc6f03d9166c7a2bba2cb97c56ebc70e1ccf5ab81981cff62bcfc2c1a8aa37f9ed16b169aa9d1a31b3b47a76d0609bc5e5c886480f0f SHA512 4f0bb7331f5765943876ee325962d25caa2c26763d8072b80c7eb80bb302ed2af9d5b4c775ec5a3fc9024a8e734039d7550b532c7253afe03fc57b3a6bcf118e
 MISC metadata.xml 301 BLAKE2B aecfa4ee7aa47bacbfd1608a32d71ab0047afb93e7fd3677844f7ae11ac604a08b59ad3061764b08bbda2568545dd5bcbe649417df0da1b882af0d5a0cfe1bec SHA512 b274784e4ea31bf68d196c33698fb54abf02cd0f7e634026ee7ccf94e16e09ada679434094fa56db2d3d1527d7aaef2aa951464539cc06be6f3e6c13c261d204
diff --git a/media-libs/gavl/files/1.4.0-gnu_source.patch b/media-libs/gavl/files/1.4.0-gnu_source.patch
new file mode 100644
index 000000000000..bdd48d5352cd
--- /dev/null
+++ b/media-libs/gavl/files/1.4.0-gnu_source.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/715780
+
+musl #ifdef:s most of the defines in sched.h with _GNU_SOURCE
+https://elixir.bootlin.com/musl/latest/source/include/sched.h#L13.
+
+---
+
+diff --git a/src/benchmark.c b/src/benchmark.c
+index eb96b2a..18fc2d2 100644
+--- a/src/benchmark.c
++++ b/src/benchmark.c
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #ifdef HAVE_SCHED_SETAFFINITY
++#define _GNU_SOURCE
+ #define __USE_GNU
+ #include <sched.h>
+ #endif
+-- 
+2.35.1
+
diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff
deleted file mode 100644
index 5c742779cdbb..000000000000
--- a/media-libs/gavl/files/1.4.0-x32.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines
-
-* Compilation fix
-
-
-Index: gavl/cputest.c
-===================================================================
---- a/gavl/cputest.c	(revision 4208)
-+++ b/gavl/cputest.c	(revision 4209)
-@@ -69,6 +69,8 @@
-      int rval = 0;
-     int eax, ebx, ecx, edx;
-     int max_std_level, max_ext_level, std_caps=0, ext_caps=0;
-+
-+#ifndef ARCH_X86_64
-     long a, c;
- 
-     __asm__ __volatile__ (
-@@ -94,6 +96,7 @@
- 
-     if (a == c)
-         return 0; /* CPUID not supported */
-+#endif // !ARCH_X86_64
- 
-     cpuid(0, max_std_level, ebx, ecx, edx);
- 
-
-------------------------------------------------------------------------
diff --git a/media-libs/gavl/files/1.4.0-x32.patch b/media-libs/gavl/files/1.4.0-x32.patch
new file mode 100644
index 000000000000..5c742779cdbb
--- /dev/null
+++ b/media-libs/gavl/files/1.4.0-x32.patch
@@ -0,0 +1,29 @@
+------------------------------------------------------------------------
+r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines
+
+* Compilation fix
+
+
+Index: gavl/cputest.c
+===================================================================
+--- a/gavl/cputest.c	(revision 4208)
++++ b/gavl/cputest.c	(revision 4209)
+@@ -69,6 +69,8 @@
+      int rval = 0;
+     int eax, ebx, ecx, edx;
+     int max_std_level, max_ext_level, std_caps=0, ext_caps=0;
++
++#ifndef ARCH_X86_64
+     long a, c;
+ 
+     __asm__ __volatile__ (
+@@ -94,6 +96,7 @@
+ 
+     if (a == c)
+         return 0; /* CPUID not supported */
++#endif // !ARCH_X86_64
+ 
+     cpuid(0, max_std_level, ebx, ecx, edx);
+ 
+
+------------------------------------------------------------------------
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index 660445f8eb00..7fdebe1f45bf 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,10 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/${PV}-x32.diff" )
+PATCHES=(
+	"${FILESDIR}/${PV}-x32.patch"
+	"${FILESDIR}/${PV}-gnu_source.patch"
+)
 
 src_prepare() {
 	default
-- 
cgit v1.2.3