From bed152ba1fc2f1316eaefb5c3d24d48195560f76 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 23 Nov 2022 07:07:57 +0000
Subject: gentoo auto-resync : 23:11:2022 - 07:07:57

---
 media-libs/libogg/Manifest                         |  3 +-
 .../libogg-1.3.5-macro-wstrict-prototypes.patch    | 20 +++++++++++++
 media-libs/libogg/libogg-1.3.5-r1.ebuild           | 33 ++++++++++++++++++++++
 media-libs/libogg/libogg-1.3.5.ebuild              | 32 ---------------------
 4 files changed, 55 insertions(+), 33 deletions(-)
 create mode 100644 media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch
 create mode 100644 media-libs/libogg/libogg-1.3.5-r1.ebuild
 delete mode 100644 media-libs/libogg/libogg-1.3.5.ebuild

(limited to 'media-libs/libogg')

diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 4d6500effd9e..1eb45b0e33dd 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,4 +1,5 @@
 AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
+AUX libogg-1.3.5-macro-wstrict-prototypes.patch 467 BLAKE2B 4434a774d9cfe47ca5142f3538a9e20bbe0589dc78136785477f6f1e3e5f8d24e34590163bbf7eaba8c04d7c9ecbdc5819c0a3bfa568e125f90ef6a9cee47b18 SHA512 062302760cb9292a185dac8748135b9288b4c933f7c9f2f73c74d2348926d0def88562a9ceb935e76669af51e732364a7bc3ba84436cb1e896cb7ab228bc4a47
 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
-EBUILD libogg-1.3.5.ebuild 815 BLAKE2B bf111643a820ac66ce3d010e0e2b946088108a8205a88dd5db0f31b6e111b98bb4b9141f59249d6d091fb9b778769c855a4fdf50450f56ed09d6ee0f1a651644 SHA512 f7b4425be30a5bf878eb87831ba0b887e9506816336822de020304c20e6a12d2e7bcdf69b350bc64baa2dcf75884054e288e7f6083d3ed1aa8ba1f9b287535fa
+EBUILD libogg-1.3.5-r1.ebuild 873 BLAKE2B 5598982bdd7bc07483c9f7d8cd0062c88efde08a4de89cf2d7272123df3e881ac334d8b6d021b7c7ca4267161bcb076bc225dd011fa7d1ce292cf4009e992ee2 SHA512 b80421324d752bc49da7dca7677b4a71af828a28447205e35f2e44379217347d058208f03d0725db937698a292b50a30333bfe23e6cc37ac7cdd60e257ccca86
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch b/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch
new file mode 100644
index 000000000000..3da8dc74c614
--- /dev/null
+++ b/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch
@@ -0,0 +1,20 @@
+https://gitlab.xiph.org/xiph/ogg/-/merge_requests/14
+
+From f6097edcf4fe5ff40077fec7733fe32827f75128 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 03:23:55 +0000
+Subject: [PATCH] ogg.m4: fix -Wstrict-prototypes
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/ogg.m4
++++ b/ogg.m4
+@@ -62,7 +62,7 @@ dnl
+ #include <string.h>
+ #include <ogg/ogg.h>
+ 
+-int main ()
++int main (void)
+ {
+   system("touch conf.oggtest");
+   return 0;
+GitLab
diff --git a/media-libs/libogg/libogg-1.3.5-r1.ebuild b/media-libs/libogg/libogg-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..438b3c5c4cc0
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="The Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
+	"${FILESDIR}"/${PN}-1.3.5-macro-wstrict-prototypes.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
deleted file mode 100644
index e7006959b9f2..000000000000
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="The Ogg media file format library"
-HOMEPAGE="https://xiph.org/ogg/"
-SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ogg/config_types.h
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-- 
cgit v1.2.3