From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B771158042 for ; Sun, 17 Nov 2024 01:18:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69AF9E0A63; Sun, 17 Nov 2024 01:18:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DFFCE0A63 for ; Sun, 17 Nov 2024 01:18:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65879341707 for ; Sun, 17 Nov 2024 01:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6620AE7 for ; Sun, 17 Nov 2024 01:18:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731806243.a97f88a3641ce086c6f8e00f276a9760b1b9bfb8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeglut/files/, media-libs/freeglut/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeglut/files/freeglut-3.6.0-c23.patch media-libs/freeglut/freeglut-3.6.0-r1.ebuild X-VCS-Directories: media-libs/freeglut/files/ media-libs/freeglut/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a97f88a3641ce086c6f8e00f276a9760b1b9bfb8 X-VCS-Branch: master Date: Sun, 17 Nov 2024 01:18:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 05181a7b-338c-43f3-a130-1eb123f8bb87 X-Archives-Hash: 923b9360a4c123d7a7eaf243c65a40bb commit: a97f88a3641ce086c6f8e00f276a9760b1b9bfb8 Author: Sam James gentoo org> AuthorDate: Sun Nov 17 01:17:23 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 17 01:17:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97f88a3 media-libs/freeglut: fix build w/ C23 Signed-off-by: Sam James gentoo.org> media-libs/freeglut/files/freeglut-3.6.0-c23.patch | 27 +++++++++++++ media-libs/freeglut/freeglut-3.6.0-r1.ebuild | 46 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) 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 +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 +}