From ca2c3743110123205a2a2734ae6220af3b383ed2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 12 Apr 2023 15:59:55 +0200
Subject: [PATCH] libdvdnav, mark x86_gcc2 as broken (parse errors), cleanup
 (#8356)

---
 media-libs/libdvdnav/libdvdnav-6.1.1.recipe | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-libs/libdvdnav/libdvdnav-6.1.1.recipe b/media-libs/libdvdnav/libdvdnav-6.1.1.recipe
index 67bf04072..7448b8f6d 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.1.recipe
+++ b/media-libs/libdvdnav/libdvdnav-6.1.1.recipe
@@ -5,17 +5,20 @@ HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
 COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdnav/$portVersion/libdvdnav-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48"
 PATCHES="libdvdnav-$portVersion.patchset"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="4.3.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libdvdnav$secondaryArchSuffix = $portVersion
-	lib:libdvdnav$secondaryArchSuffix = 4.3.0 compat >= 4
+	lib:libdvdnav$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -24,7 +27,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libdvdnav${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdnav$secondaryArchSuffix = 4.3.0 compat >= 4
+	devel:libdvdnav$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libdvdnav$secondaryArchSuffix == $portVersion base
@@ -59,7 +62,7 @@ INSTALL()
 	rm $libDir/libdvdnav.la
 
 	# prepare develop/lib
-	prepareInstalledDevelLibs libdvdnav
+	prepareInstalledDevelLib libdvdnav
 	fixPkgconfig
 
 	packageEntries devel \