From a1728f83e872f2ae1f8f3f9fe33c426cfe218be7 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 3 Sep 2023 16:38:06 +0000
Subject: [PATCH] libcdio_paranoia, bump version (#9350)

---
 ...ipe => libcdio_paranoia-10.2_2.0.1.recipe} | 15 ++---
 .../libcdio_paranoia-10.2_2.0.0.patchset      | 67 -------------------
 2 files changed, 6 insertions(+), 76 deletions(-)
 rename dev-libs/libcdio-paranoia/{libcdio_paranoia-10.2_2.0.0.recipe => libcdio_paranoia-10.2_2.0.1.recipe} (86%)
 delete mode 100644 dev-libs/libcdio-paranoia/patches/libcdio_paranoia-10.2_2.0.0.patchset

diff --git a/dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.0.recipe b/dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.1.recipe
similarity index 86%
rename from dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.0.recipe
rename to dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.1.recipe
index f718975ae..a5f2e844c 100644
--- a/dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.0.recipe
+++ b/dev-libs/libcdio-paranoia/libcdio_paranoia-10.2_2.0.1.recipe
@@ -7,16 +7,13 @@ COPYRIGHT="2012-2019 Rocky Bernstein
 	Monty
 	Robert Kausch"
 LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2"
-CHECKSUM_SHA256="4565c18caf401083c53733e6d2847b6671ba824cff1c7792b9039693d34713c1"
-SOURCE_DIR="libcdio-paranoia-10.2+2.0.0"
-if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-	PATCHES="libcdio_paranoia-10.2_2.0.0.patchset"
-fi
+REVISION="1"
+SOURCE_URI="https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2"
+CHECKSUM_SHA256="33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a"
+SOURCE_DIR="libcdio-paranoia-10.2+2.0.1"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all ?x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 libVersion="2.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
diff --git a/dev-libs/libcdio-paranoia/patches/libcdio_paranoia-10.2_2.0.0.patchset b/dev-libs/libcdio-paranoia/patches/libcdio_paranoia-10.2_2.0.0.patchset
deleted file mode 100644
index 9efb4670a..000000000
--- a/dev-libs/libcdio-paranoia/patches/libcdio_paranoia-10.2_2.0.0.patchset
+++ /dev/null
@@ -1,67 +0,0 @@
-From 7585811a602b21d633657050cd1ed954af9c5f41 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 2 Sep 2018 13:16:51 +0200
-Subject: gcc2 fixes
-
-
-diff --git a/lib/cdda_interface/utils.c b/lib/cdda_interface/utils.c
-index 9aed89d..a4350df 100644
---- a/lib/cdda_interface/utils.c
-+++ b/lib/cdda_interface/utils.c
-@@ -178,6 +178,7 @@ gettime(struct timespec *ts) {
- #if defined(HAVE_CLOCK_GETTIME)
-   /* Use clock_gettime if available, preferably using the monotonic clock.
-    */
-+  {
-   static clockid_t clock = (clockid_t)-1;
-   if ((int)clock == -1) clock = (clock_gettime(CLOCK_MONOTONIC, ts) < 0 ? CLOCK_REALTIME : CLOCK_MONOTONIC);
-   ret = clock_gettime(clock, ts);
-@@ -202,4 +203,5 @@ gettime(struct timespec *ts) {
- #endif
- 
-   return ret;
-+  }
- }
-diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c
-index 17a1139..f32fe48 100644
---- a/lib/paranoia/paranoia.c
-+++ b/lib/paranoia/paranoia.c
-@@ -1400,6 +1400,7 @@ i_stage2_each(root_block *root, v_fragment_t *v,
-   /* If this fragment has already been merged & freed, abort. */
-   if (!v || !v->one) return(0);
- 
-+  {
-   cdrom_paranoia_t *p=v->p;
- 
-   /* "??? Why do we round down to an even dynoverlap?" Dynoverlap is
-@@ -2118,6 +2119,7 @@ i_stage2_each(root_block *root, v_fragment_t *v,
- 
-     }
-   } /* endif rv(root) */
-+  }
- }
- 
- static int
-diff --git a/src/getopt.c b/src/getopt.c
-index 80c7cb2..dce7d6a 100644
---- a/src/getopt.c
-+++ b/src/getopt.c
-@@ -877,6 +877,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
- 	if (longopts == NULL)
- 	  goto no_longs;
- 
-+	{
- 	char *nameend;
- 	const struct option *p;
- 	const struct option *pfound = NULL;
-@@ -1096,6 +1097,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
-       no_longs:
- 	d->__nextchar = NULL;
- 	return 'W';	/* Let the application handle it.   */
-+	}
-       }
-     if (temp[1] == ':')
-       {
--- 
-2.16.4
-