agar, bump version, enable recipe (#9153)

2026-04-22 19:50:05 +02:00 · 2023-08-05 16:38:04 +00:00
parent 8dd3666496
commit 579bb64d1f
3 changed files with 150 additions and 268 deletions
--- a/media-libs/agar/agar-1.7.0.recipe
+++ b/media-libs/agar/agar-1.7.0.recipe
@@ -3,18 +3,19 @@ DESCRIPTION="Cross-platform GUI toolkit.  Agar provides a base framework and \
 a collection of GUI widgets from which GUI applications can be built.  Agar \
 can be styled and themed using a CSS-style engine."
 HOMEPAGE="http://libagar.org/index.html.en"
-COPYRIGHT="2002-2016 Hypertrition, Inc."
+COPYRIGHT="2001-2023 Julien Nadeau Carriere
+	2002-2016 Hypertrition, Inc."
 LICENSE="BSD (2-clause)
 	OFL v1.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/JulNadeauCA/libagar/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1cc3fcbbce394981c421bb7429c70020e0ee443c1e15dbf701c2e0504ad035b0"
+CHECKSUM_SHA256="403caa219e7e367ecb30d0f252f9f5423f5ce30ed7b60ab144da1d895c19c3e6"
 SOURCE_FILENAME="agar-v$portVersion.tar.gz"
 SOURCE_DIR="libagar-$portVersion"
 PATCHES="agar-$portVersion.patchset"

-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"

 commandBinDir=$binDir
 commandSuffix=$secondaryArchSuffix
@@ -23,7 +24,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi

-libVersion="6.0.0"
+libVersion="7.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

 PROVIDES="
@@ -44,7 +45,7 @@ REQUIRES="
 	lib:libGLU$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -67,8 +68,9 @@ PROVIDES_devel="
 REQUIRES_devel="
 	agar$secondaryArchSuffix == $portVersion base
 	devel:libfreetype$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libSDL_1.2$secondaryArchSuffix
+	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"

@@ -80,7 +82,7 @@ BUILD_REQUIRES="
 	devel:libGLU$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libSDL_1.2$secondaryArchSuffix
+	devel:libSDL2_2.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
@@ -119,6 +121,8 @@ INSTALL()
 	sed -i "s|include|develop/headers$secondaryArchSubDir|" $commandBinDir/agar-sg-config
 	sed -i "s|include|develop/headers$secondaryArchSubDir|" $commandBinDir/agar-sk-config
 	sed -i "s|include|develop/headers$secondaryArchSubDir|" $commandBinDir/agar-vg-config
+	# 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
 	fixPkgconfig
--- a/media-libs/agar/patches/agar-1.6.0.patchset
+++ b/media-libs/agar/patches/agar-1.6.0.patchset
@@ -1,259 +0,0 @@
-From 07f63ca69ae713b20efe1405a0978acf141026ec Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 29 Jun 2022 11:36:41 +0200
-Subject: Fix install path for agar.m4
-
-
-diff --git a/Makefile b/Makefile
-index a00dc8c..c7beef2 100644
--- a/Makefile
-+++ b/Makefile
-@@ -38,7 +38,7 @@ includes:
- 	fi
- 
- cleandir-config:
-	rm -fR include config 
-+	rm -fR include config
- 	rm -f Makefile.config config.log configure.lua .projfiles.out .projfiles2.out
- 	touch Makefile.config
- 	-(cd tools && ${MAKE} cleandir)
-@@ -88,12 +88,12 @@ install-config:
- 			${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${PKGCONFIG_LIBDIR}; \
- 		done; \
- 	fi
-	@if [ ! -e "${DESTDIR}${PREFIX}/share/aclocal" ]; then \
-		echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"; \
-		${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal; \
-+	@if [ ! -e "${DESTDIR}${DATADIR}/aclocal" ]; then \
-+		echo "${INSTALL_DATA_DIR} ${DATADIR}/aclocal"; \
-+		${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}/aclocal; \
- 	fi
-	@echo "${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${PREFIX}/share/aclocal"
-	@${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DESTDIR}${PREFIX}/share/aclocal
-+	@echo "${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DATADIR}/aclocal"
-+	@${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DESTDIR}${DATADIR}/aclocal
- 
- deinstall-config:
- 	@for F in ${AVAIL_CONFIGSCRIPTS}; do \
-@@ -107,7 +107,7 @@ deinstall-config:
- 		done; \
- 	fi
- 	@echo "${DEINSTALL_DATA} ${PREFIX}/share/aclocal/agar.m4"
-	@${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${PREFIX}/share/aclocal/agar.m4
-+	@${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${DATADIR}/aclocal/agar.m4
- 
- pre-package:
- 	@if [ "${PKG_OS}" = "windows" ]; then \
-- 
-2.36.1
-
-
-From 77d24792be6289502772f53f01e4bedc0e45bb36 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 29 Jun 2022 12:20:20 +0200
-Subject: Fix detection for libjpeg
-
-
-diff --git a/configure b/configure
-index 8adadcb..74aafe1 100755
--- a/configure
-+++ b/configure
-@@ -1,7 +1,7 @@
- #!/bin/sh
- #
- # Do not edit!
-# 
-+#
- # This file was generated from configure.in. To regenerate it properly, get
- # BSDBuild 3.2 or later from https://bsdbuild.hypertriton.com/ and use:
- #
-@@ -676,7 +676,7 @@ if [ $? != 0 ]; then
- fi
- cat << EOT > conftest.1
- .\" COMMENT
-.Dd 
-+.Dd
- .Dd NOVEMBER 23, 2009
- .Dt TEST 1
- .Os
-@@ -1916,7 +1916,7 @@ EOT
- 	else
- 		HAVE_OBJC="yes"
- 	fi
-	
-+
- 	if [ "${HAVE_OBJC}" = "yes" ]; then
- 		if [ "${EXECSUFFIX}" = '' ]; then
- 			EXECSUFFIX=''
-@@ -6632,7 +6632,7 @@ echo 'hdefs["OPENGL_CFLAGS"] = nil' >>configure.lua
- echo '#undef OPENGL_LIBS' >$bb_incdir/opengl_libs.h
- echo 'hdefs["OPENGL_LIBS"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_x}" != 'no' ]
-  then
- $ECHO_N 'checking for the X window system...'
-@@ -7416,7 +7416,7 @@ echo 'hdefs["XINERAMA_CFLAGS"] = nil' >>configure.lua
- echo '#undef XINERAMA_LIBS' >$bb_incdir/xinerama_libs.h
- echo 'hdefs["XINERAMA_LIBS"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_cocoa}" != 'no' ]
-  then
- $ECHO_N 'checking for the Cocoa framework...'
-@@ -7635,7 +7635,7 @@ echo 'hdefs["GLX_CFLAGS"] = nil' >>configure.lua
- echo '#undef GLX_LIBS' >$bb_incdir/glx_libs.h
- echo 'hdefs["GLX_LIBS"] = nil' >>configure.lua
- 		fi
-		
-+
- 		if [ "${with_wgl}" != 'no' ]
-  then
- $ECHO_N 'checking for the WGL interface...'
-@@ -7741,7 +7741,7 @@ HAVE_WGL="no"
- echo '#undef HAVE_WGL' >$bb_incdir/have_wgl.h
- echo 'hdefs["HAVE_WGL"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_freetype}" != 'no' ]
-  then
- $ECHO_N 'checking for FreeType...'
-@@ -8063,7 +8063,7 @@ echo 'hdefs["FREETYPE_CFFLAGS"] = nil' >>configure.lua
- echo '#undef FREETYPE_LIBS' >$bb_incdir/freetype_libs.h
- echo 'hdefs["FREETYPE_LIBS"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_fontconfig}" != 'no' ]
-  then
- $ECHO_N 'checking for fontconfig...'
-@@ -8292,7 +8292,7 @@ echo 'hdefs["FONTCONFIG_CFLAGS"] = nil' >>configure.lua
- echo '#undef FONTCONFIG_LIBS' >$bb_incdir/fontconfig_libs.h
- echo 'hdefs["FONTCONFIG_LIBS"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_jpeg}" != 'no' ]
-  then
- $ECHO_N 'checking for libjpeg...'
-@@ -8329,6 +8329,14 @@ if [ -e "/opt/include/jpeglib.h" ]; then
- JPEG_CFLAGS="-I/opt/include"
- JPEG_LIBS="-L/opt/lib -ljpeg"
- fi
-+if [ -e "/boot/system/develop/headers/x86/jpeglib.h" ]; then
-+JPEG_CFLAGS="-I/boot/system/develop/headers/x86"
-+JPEG_LIBS="-L/boot/systeem/lib/x86 -ljpeg"
-+fi
-+if [ -e "/boot/system/develop/headers/jpeglib.h" ]; then
-+JPEG_CFLAGS="-I/boot/system/develop/headers"
-+JPEG_LIBS="-L/boot/systeem/lib -ljpeg"
-+fi
- fi
- if [ "${JPEG_LIBS}" != "" ]; then
- echo 'yes'
-@@ -8467,7 +8475,7 @@ echo 'hdefs["JPEG_CFLAGS"] = nil' >>configure.lua
- echo '#undef JPEG_LIBS' >$bb_incdir/jpeg_libs.h
- echo 'hdefs["JPEG_LIBS"] = nil' >>configure.lua
- 	fi
-	
-+
- 	if [ "${with_png}" != 'no' ]
-  then
- $ECHO_N 'checking for libpng...'
-@@ -13137,7 +13145,7 @@ while test \$# -gt 0; do
- done
- EOT
- AVAIL_CONFIGSCRIPTS="$AVAIL_CONFIGSCRIPTS agar-config"
-	
-+
- pkgconfig_module_out="agar"
- pkgconfig_module_desc="Agar cross-platform GUI toolkit"
- pkgconfig_module_requires="${X11_PC} ${SDL_PC} ${FREETYPE_PC} ${FONTCONFIG_PC} ${OPENGL_PC} ${XINERAMA_PC} ${JPEG_PC} ${PNG_PC} ${UIM_PC}"
-- 
-2.36.1
-
-
-From 34b90e57b34056e71faca6ea3b76547f3ce487d7 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 29 Jun 2022 12:45:05 +0200
-Subject: Fix detection for libGL
-
-
-diff --git a/configure b/configure
-index 74aafe1..6f994f6 100755
--- a/configure
-+++ b/configure
-@@ -6303,6 +6303,14 @@ if [ -e "/usr/local/include/GL" ]; then
- GL_CFLAGS="-I/usr/local/include"
- GL_FOUND=yes
- fi
-+if [ -e "/boot/system/develop/headers/x86/GL" ]; then
-+GL_CFLAGS="-I/boot/system/develop/headers/x86"
-+GL_FOUND=yes
-+fi
-+if [ -e "/boot/system/develop/headers/GL" ]; then
-+GL_CFLAGS="-I/boot/system/develop/headers"
-+GL_FOUND=yes
-+fi
- if [ -e "/usr/local/X11/lib" ]; then
- GL_LIBS="${GL_LIBS} -L/usr/local/X11/lib"
- GL_FOUND=yes
-@@ -6331,6 +6339,14 @@ if [ -e "/usr/local/lib" ]; then
- GL_LIBS="${GL_LIBS} -L/usr/local/lib"
- GL_FOUND=yes
- fi
-+if [ -e "/boot/system/lib/x86" ]; then
-+GL_LIBS="${GL_LIBS} -L/boot/system/lib/x86"
-+GL_FOUND=yes
-+fi
-+if [ -e "/boot/system/lib" ]; then
-+GL_LIBS="${GL_LIBS} -L/boot/system/lib"
-+GL_FOUND=yes
-+fi
- ;;
- esac
- fi
-- 
-2.36.1
-
-
-From 7a574fba87ed2ffc60deee904280a8f04e39f213 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 29 Jun 2022 12:57:05 +0200
-Subject: Fix detection for libGLU
-
-
-diff --git a/configure b/configure
-index 6f994f6..25fb6aa 100755
--- a/configure
-+++ b/configure
-@@ -6340,7 +6340,7 @@ GL_LIBS="${GL_LIBS} -L/usr/local/lib"
- GL_FOUND=yes
- fi
- if [ -e "/boot/system/lib/x86" ]; then
-GL_LIBS="${GL_LIBS} -L/boot/system/lib/x86"
-+GL_LIBS="${GL_LIBS} -L/boot/system/lib/x86p "
- GL_FOUND=yes
- fi
- if [ -e "/boot/system/lib" ]; then
-@@ -12672,6 +12672,14 @@ if [ -e "/usr/X11R6/include/GL/glu.h" ]; then
- GLU_CFLAGS="-I/usr/X11R6/include"
- GLU_LIBS="-L/usr/X11R6/lib -lGLU"
- fi
-+if [ -e "/boot/system/develop/headers/x86/GL/glu.h" ]; then
-+GLU_CFLAGS="-I/boot/system/develop/headers/x86"
-+GLU_LIBS="-L/boot/systeem/lib/x86 -lGLU"
-+fi
-+if [ -e "/boot/system/develop/headers/GL/glu.h" ]; then
-+GLU_CFLAGS="-I/boot/system/develop/headers"
-+GLU_LIBS="-L/boot/systeem/lib -lGLU"
-+fi
- fi
- ;;
- esac
-- 
-2.36.1
-
--- a/media-libs/agar/patches/agar-1.7.0.patchset
+++ b/media-libs/agar/patches/agar-1.7.0.patchset
@@ -0,0 +1,137 @@
+From 736624fb766007edcd099eeeef49c21db5d283da 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
+
+
+diff --git a/configure b/configure
+index af05e4c..47c2e27 100755
+--- a/configure
+++ b/configure
+@@ -10060,6 +10060,14 @@ if [ -e "/usr/local/include/GL" ]; then
+ GL_CFLAGS="-I/usr/local/include"
+ GL_FOUND=yes
+ fi
+if [ -e "/boot/system/develop/headers/x86/GL" ]; then
+GL_CFLAGS="-I/boot/system/develop/headers/x86"
+GL_FOUND=yes
+fi
+if [ -e "/boot/system/develop/headers/GL" ]; then
+GL_CFLAGS="-I/boot/system/develop/headers"
+GL_FOUND=yes
+fi
+ if [ -e "/usr/local/X11/lib" ]; then
+ GL_LIBS="${GL_LIBS} -L/usr/local/X11/lib"
+ GL_FOUND=yes
+@@ -10088,6 +10096,14 @@ if [ -e "/usr/local/lib" ]; then
+ GL_LIBS="${GL_LIBS} -L/usr/local/lib"
+ GL_FOUND=yes
+ fi
+if [ -e "/boot/system/lib/x86" ]; then
+GL_LIBS="${GL_LIBS} -L/boot/system/lib/x86"
+GL_FOUND=yes
+fi
+if [ -e "/boot/system/lib" ]; then
+GL_LIBS="${GL_LIBS} -L/boot/system/lib"
+GL_FOUND=yes
+fi
+ ;;
+ esac
+ fi
+@@ -11865,6 +11881,14 @@ if [ -e "/opt/include/jpeglib.h" ]; then
+ JPEG_CFLAGS="-I/opt/include"
+ JPEG_LIBS="-L/opt/lib -ljpeg"
+ fi
+if [ -e "/boot/system/develop/headers/x86/jpeglib.h" ]; then
+JPEG_CFLAGS="-I/boot/system/develop/headers/x86"
+JPEG_LIBS="-L/boot/systeem/lib/x86 -ljpeg"
+fi
+if [ -e "/boot/system/develop/headers/jpeglib.h" ]; then
+JPEG_CFLAGS="-I/boot/system/develop/headers"
+JPEG_LIBS="-L/boot/systeem/lib -ljpeg"
+fi
+ fi
+ if [ "${JPEG_LIBS}" != "" ]; then
+ echo 'yes'
+@@ -15730,6 +15754,14 @@ if [ -e "/usr/X11R6/include/GL/glu.h" ]; then
+ GLU_CFLAGS="-I/usr/X11R6/include"
+ GLU_LIBS="-L/usr/X11R6/lib -lGLU"
+ fi
+if [ -e "/boot/system/develop/headers/x86/GL/glu.h" ]; then
+GLU_CFLAGS="-I/boot/system/develop/headers/x86"
+GLU_LIBS="-L/boot/systeem/lib/x86 -lGLU"
+fi
+if [ -e "/boot/system/develop/headers/GL/glu.h" ]; then
+GLU_CFLAGS="-I/boot/system/develop/headers"
+GLU_LIBS="-L/boot/systeem/lib -lGLU"
+fi
+ fi
+ ;;
+ esac
+-- 
+2.37.3
+
+
+From 81419141ca3e3ef62bb44505f853f12e5f81f0a1 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
+
+
+diff --git a/Makefile b/Makefile
+index 339a5c2..d0fca06 100644
+--- a/Makefile
+++ b/Makefile
+@@ -89,12 +89,12 @@ install-config:
+ 			${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${PKGCONFIG_LIBDIR}; \
+ 		done; \
+ 	fi
+-	@if [ ! -e "${DESTDIR}${PREFIX}/share/aclocal" ]; then \
+-		echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"; \
+-		${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal; \
+	@if [ ! -e "${DESTDIR}${DATADIR}/aclocal" ]; then \
+		echo "${INSTALL_DATA_DIR} ${DATADIR}/aclocal"; \
+		${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}/aclocal; \
+ 	fi
+-	@echo "${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${PREFIX}/share/aclocal"
+-	@${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DESTDIR}${PREFIX}/share/aclocal
+	@echo "${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DATADIR}/aclocal"
+	@${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DESTDIR}${DATADIR}/aclocal
+ 	@echo "${INSTALL_DATA} Makefile.config ${DATADIR}/agar.mk"
+ 	@${SUDO} ${INSTALL_DATA} Makefile.config ${DESTDIR}${DATADIR}/agar.mk
+ 	@echo "${INSTALL_DATA} configure.lua ${DATADIR}/agar.lua"
+@@ -112,7 +112,7 @@ deinstall-config:
+ 		done; \
+ 	fi
+ 	@echo "${DEINSTALL_DATA} ${PREFIX}/share/aclocal/agar.m4"
+-	@${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${PREFIX}/share/aclocal/agar.m4
+	@${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${DATADIR}/aclocal/agar.m4
+ 	@for F in agar.mk agar.lua; do \
+ 		echo "${DEINSTALL_DATA} ${DATADIR}/$$F"; \
+ 		${SUDO} ${DEINSTALL_DATA} ${DESTDIR}${DATADIR}/$$F; \
+-- 
+2.37.3
+
+
+From 7efc954860e0b279517836d694a81a8bf738837e Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Sat, 5 Aug 2023 11:00:47 +0000
+Subject: Build fix
+
+
+diff --git a/gui/inline_surface.h b/gui/inline_surface.h
+index 95a25a4..4393567 100644
+--- a/gui/inline_surface.h
+++ b/gui/inline_surface.h
+@@ -417,7 +417,7 @@ ag_surface_get32_at(const AG_Surface *S, const Uint8 *p)
+ 			AG_Color c;
+ 
+ # if AG_BYTEORDER == AG_BIG_ENDIAN
+-			px = (((Uint64)p[0] << 32) |
+			px = ((Uint64)p[0] << 32) |
+ 			      ((Uint64)p[1] << 24) |
+ 			      ((Uint64)p[2] << 16) |
+ 			      ((Uint64)p[3] <<  8) |
+-- 
+2.37.3
+