gentoo auto-resync : 17:11:2024 - 03:03:09

3 files changed, 75 insertions, 0 deletions

diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 4bb706059561..b90593b34bd0 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,3 +1,5 @@
+AUX freeglut-3.6.0-c23.patch 896 BLAKE2B 61470d013ba04bd738fbaa8a80e9ace000fd5dc3e9f8f46e9d003d3fcbc06fbd529dbb78ddaa977a3ae0c895452de0790feaa0c7caac14ea9b7916c0cab434d8 SHA512 9fc73f321f4aba7e9287baafa375ee1f0d84c912ee523d4abfe9a71bcd7f4cdecad014f1e72fe2e587b891a1f9d54e4ce56e85947bdf88e8b02d8b105e7b3ba8
 DIST freeglut-3.6.0.tar.gz 429619 BLAKE2B c42985013aafbe0e21369295f67355f2b498f284289fceed9baff5de6a46b7fee2a2ee07e00c136f65caa9159b635df82030a112eae101f9f82751abd76636e4 SHA512 ceb5dd9ea86e915acb177e405e79b92f77cf3213ba21fe200491d0b1150dd9c81835b71cb8a928bd514eb719626ff802250429df2f6dfa33f8e181c3f74b2dd0
+EBUILD freeglut-3.6.0-r1.ebuild 1376 BLAKE2B b781ad45cd03ba65d9b1ee532a43f922fabd4584c2b9373b5f86261185dbba4b20be000ad71b8aec03a889d5ee7e1f246df482b45ae085223a71ed03e50832c0 SHA512 ac8702822df26fa17fc0fba15ad33743885e25afbfb5925412a30f95cca7d4e5a1c04524a30b1afded8f17ceda7d34d42cefc0bf77cf06cee16a32f08c252cf9
 EBUILD freeglut-3.6.0.ebuild 1319 BLAKE2B 5c5152d727db8aec67454bc7859abbbe7419f0acc233e92873b3ec322762071f562ca1db52fafa20aedfedcc5450f8af29e3134ffd0004989fe4fdc7329850b1 SHA512 aa5957284b2c837e78b3d348d45cfcca29836dbd1f02c04c8bc6ec51ce6aa808dd9cbb8d087e12fb08b0e3dc8c5789bc7f63a009d7efb2def3866b9d2408ac6f
 MISC metadata.xml 594 BLAKE2B 984028f68aa76f8cfe537ea8a9f090af580cbe5ec33007c91b5b95b1f8c5396c779f67155d99fce7708e4fba8ee661f35fb01f5fd714a5ccc08794516df15820 SHA512 159f5756565afb1a55ac874afc42e49591c94519970d10eb7857159262bf4f6e372e5c0584f03ed1ad70e28bb5d328d3f36fdb0208d9de8f22e307973ee38167
diff --git a/media-libs/freeglut/files/freeglut-3.6.0-c23.patch b/media-libs/freeglut/files/freeglut-3.6.0-c23.patch
new file mode 100644
index 000000000000..c5cd5ee5dbf3
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-3.6.0-c23.patch
@@ -0,0 +1,27 @@
+https://github.com/freeglut/freeglut/pull/187
+
+From ca500e65b40267efe7a05ec7ebae1141544c0cfb Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 17 Nov 2024 01:14:26 +0000
+Subject: [PATCH] egl: fix fgPlatformDestroyContext prototype for C23
+
+C23 removes unprototyped functions, so this conflicted with the definition
+in fg_init_x11.c.
+
+Bug: https://github.com/freeglut/freeglut/issues/186
+---
+ src/egl/fg_init_egl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/egl/fg_init_egl.h b/src/egl/fg_init_egl.h
+index 592c5221d..8753dc0bc 100644
+--- a/src/egl/fg_init_egl.h
++++ b/src/egl/fg_init_egl.h
+@@ -28,6 +28,6 @@
+ 
+ extern void fghPlatformInitializeEGL();
+ extern void fghPlatformCloseDisplayEGL();
+-extern void fgPlatformDestroyContext();
++extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
+ 
+ #endif
diff --git a/media-libs/freeglut/freeglut-3.6.0-r1.ebuild b/media-libs/freeglut/freeglut-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..d21631d891b0
--- /dev/null
+++ b/media-libs/freeglut/freeglut-3.6.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
+HOMEPAGE="https://freeglut.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+# enabling GLES support seems to cause build failures
+RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
+# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.0-c23.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
+		"-DFREEGLUT_GLES=OFF"
+		"-DFREEGLUT_BUILD_DEMOS=OFF"
+		"-DFREEGLUT_BUILD_STATIC_LIBS=OFF"
+	)
+#	$(cmake-utils_use gles FREEGLUT_GLES)
+	cmake-multilib_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
+}