From e6ee02e2d423c3bef5121d994de9d0f46d49ad13 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 9 Jan 2024 15:12:41 +0100
Subject: [PATCH] agar, revbump, disable libGL (crashes) (#9970)

---
 media-libs/agar/agar-1.7.0.recipe           | 16 ++++-----
 media-libs/agar/patches/agar-1.7.0.patchset | 37 +++++++++++++++++----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/media-libs/agar/agar-1.7.0.recipe b/media-libs/agar/agar-1.7.0.recipe
index f04dabae1..10007d702 100644
--- a/media-libs/agar/agar-1.7.0.recipe
+++ b/media-libs/agar/agar-1.7.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2001-2023 Julien Nadeau Carriere
 	2002-2016 Hypertrition, Inc."
 LICENSE="BSD (2-clause)
 	OFL v1.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/JulNadeauCA/libagar/archive/refs/tags/v$portVersion.tar.gz"
 CHECKSUM_SHA256="403caa219e7e367ecb30d0f252f9f5423f5ce30ed7b60ab144da1d895c19c3e6"
 SOURCE_FILENAME="agar-v$portVersion.tar.gz"
@@ -33,8 +33,8 @@ PROVIDES="
 	lib:libag_gui$secondaryArchSuffix = $libVersionCompat
 	lib:libag_math$secondaryArchSuffix = $libVersionCompat
 	lib:libag_net$secondaryArchSuffix = $libVersionCompat
-	lib:libag_sg$secondaryArchSuffix = $libVersionCompat
-	lib:libag_sk$secondaryArchSuffix = $libVersionCompat
+#	lib:libag_sg$secondaryArchSuffix = $libVersionCompat
+#	lib:libag_sk$secondaryArchSuffix = $libVersionCompat
 	lib:libag_vg$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -61,14 +61,14 @@ PROVIDES_devel="
 	devel:libag_gui$secondaryArchSuffix = $libVersionCompat
 	devel:libag_math$secondaryArchSuffix = $libVersionCompat
 	devel:libag_net$secondaryArchSuffix = $libVersionCompat
-	devel:libag_sg$secondaryArchSuffix = $libVersionCompat
-	devel:libag_sk$secondaryArchSuffix = $libVersionCompat
+#	devel:libag_sg$secondaryArchSuffix = $libVersionCompat
+#	devel:libag_sk$secondaryArchSuffix = $libVersionCompat
 	devel:libag_vg$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	agar$secondaryArchSuffix == $portVersion base
 	devel:libfreetype$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
+#	devel:libGL$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -78,7 +78,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
+#	devel:libGL$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
@@ -124,7 +124,7 @@ INSTALL()
 	# libGL doesn't provide a gl.pc file, remove requirement for it in agar.pc
 	sed -i "s|freetype2  gl  |freetype2  |" $libDir/pkgconfig/agar.pc
 
-	prepareInstalledDevelLibs libag_core libag_gui libag_math libag_net libag_vg libag_sg libag_sk
+	prepareInstalledDevelLibs libag_core libag_gui libag_math libag_net libag_vg # libag_sg libag_sk
 	fixPkgconfig
 
 	packageEntries devel  \
diff --git a/media-libs/agar/patches/agar-1.7.0.patchset b/media-libs/agar/patches/agar-1.7.0.patchset
index b82713898..4c67082d7 100644
--- a/media-libs/agar/patches/agar-1.7.0.patchset
+++ b/media-libs/agar/patches/agar-1.7.0.patchset
@@ -1,4 +1,4 @@
-From 736624fb766007edcd099eeeef49c21db5d283da Mon Sep 17 00:00:00 2001
+From 085a6df8ac10fe9a84c7243380a0c1ec1eeeada3 Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sat, 5 Aug 2023 10:47:56 +0000
 Subject: Fix detections for libjpeg, libGL and libGLU
@@ -69,10 +69,10 @@ index af05e4c..47c2e27 100755
  ;;
  esac
 -- 
-2.37.3
+2.42.1
 
 
-From 81419141ca3e3ef62bb44505f853f12e5f81f0a1 Mon Sep 17 00:00:00 2001
+From 24fc1b5f85993fddd75d4af69fc2a964c77987f7 Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sat, 5 Aug 2023 10:52:37 +0000
 Subject: Fix install path for agar.m4
@@ -110,10 +110,10 @@ index 339a5c2..d0fca06 100644
  		echo "${DEINSTALL_DATA} ${DATADIR}/$$F"; \
  		${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${DATADIR}/$$F; \
 -- 
-2.37.3
+2.42.1
 
 
-From 7efc954860e0b279517836d694a81a8bf738837e Mon Sep 17 00:00:00 2001
+From 44f9c9bd237e0c0567af199a404920e56d32e95b Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sat, 5 Aug 2023 11:00:47 +0000
 Subject: Build fix
@@ -133,5 +133,30 @@ index 95a25a4..4393567 100644
  			      ((Uint64)p[2] << 16) |
  			      ((Uint64)p[3] <<  8) |
 -- 
-2.37.3
+2.42.1
+
+
+From ddd52f791b50acedb532fcc74b12cd0e4343cb1a Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Tue, 9 Jan 2024 10:42:03 +0100
+Subject: Fix SONAME declaration in libraries
+
+
+diff --git a/mk/build.lib.mk b/mk/build.lib.mk
+index 47acafa..4413622 100644
+--- a/mk/build.lib.mk
++++ b/mk/build.lib.mk
+@@ -395,6 +395,10 @@ lib${LIB}.so: ${SRCS_GENERATED} _lib_objs ${OBJS}
+ 	        echo "${CC} -shared -o $$_libout -Wl,-soname,lib${LIB}.so.${LIB_CURRENT} ${LDFLAGS} $$_objs ${LIBS}"; \
+ 	        ${CC} -shared -o $$_libout -Wl,-soname,lib${LIB}.so.${LIB_CURRENT} ${LDFLAGS} $$_objs ${LIBS}; \
+ 	        ;; \
++	    *-haiku*) \
++	        echo "${CC} -shared -o $$_libout -Wl,-soname,lib${LIB}.so.${LIB_CURRENT} ${LDFLAGS} $$_objs ${LIBS}"; \
++	        ${CC} -shared -o $$_libout -Wl,-soname,lib${LIB}.so.${LIB_CURRENT} ${LDFLAGS} $$_objs ${LIBS}; \
++	        ;; \
+ 	    *) \
+ 	        echo "${CC} -shared -o $$_libout -Wl,-rpath,${LIBDIR} ${LDFLAGS} $$_objs"; \
+ 	        ${CC} -shared -o $$_libout -Wl,-rpath ${LIBDIR} ${LDFLAGS} $$_objs; \
+-- 
+2.42.1