commit: 7edebb63fde3b6a78ac38ae586eddcc9afee9117 parent e05bed78d64ab83f5bcf7998851121c1ef9e6894 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Thu, 22 Dec 2022 01:07:47 +0100 media-libs/freeglut: drop 3.2.1, drop 3.2.2, add 3.4.0Diffstat:
| M | media-libs/freeglut/Manifest | 3 | +-- |
| D | media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch | 81 | ------------------------------------------------------------------------------- |
| D | media-libs/freeglut/freeglut-3.2.1-r1.ebuild | 58 | ---------------------------------------------------------- |
| D | media-libs/freeglut/freeglut-3.2.2.ebuild | 56 | -------------------------------------------------------- |
| A | media-libs/freeglut/freeglut-3.4.0.ebuild | 56 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
5 files changed, 57 insertions(+), 197 deletions(-)diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest@@ -1,2 +1 @@ -DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 -DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9 +DIST freeglut-3.4.0.tar.gz 413389 BLAKE2B 47b073c4e81473417358452ede3891b6fc36e324f66eec42fcbbadebb2144680e3b52caded504135239e170fd8f30a1fe8b6666a746b06d48cd7226c98a8114e SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228bdiff --git a/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch b/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch@@ -1,81 +0,0 @@ -From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Tue, 21 Jan 2020 22:33:49 +0000 -Subject: [PATCH] fg_gl2: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -[ 31%] Linking C executable bin/Lorenz_static -/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1 -/usr/lib/ccache/bin/cc -Wall -pedantic -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \ - -o bin/Lorenz_static -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0): - multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here -ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8): - multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here -``` - -Note: duplicate definition comes here from 'fg_gl2.h'. -The fix is to move declaration to a 'fg_gl2.c' file. - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Bug: https://bugs.gentoo.org/705840 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - src/fg_gl2.c | 12 ++++++++++++ - src/fg_gl2.h | 14 +++++++------- - 2 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c -index 38b0acbb..f79c432a 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,18 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifdef GL_ES_VERSION_2_0 -+/* Use existing functions on GLES 2.0 */ -+#else -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif -diff --git a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild b/media-libs/freeglut/freeglut-3.2.1-r1.ebuild@@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library" -HOMEPAGE="http://freeglut.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="debug static-libs wayland-only gles2-only" - -RDEPEND=" - !wayland-only? ( - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.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}] - ) - wayland-only? ( - media-libs/mesa[egl(+),${MULTILIB_USEDEP}] - dev-libs/wayland[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - ) - !gles2-only? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - gles2-only? ( media-libs/mesa[gles1,gles2,${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - !wayland-only? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.1-gcc10-fno-common.patch - "${FILESDIR}"/${PN}-3.2.1-opengl-cmake.patch -) -HTML_DOCS=( doc/. ) - -src_configure() { - local mycmakeargs=( - "-DFREEGLUT_BUILD_DEMOS=OFF" - "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" - "-DFREEGLUT_WAYLAND=$(usex wayland-only ON OFF)" - "-DFREEGLUT_GLES=$(usex gles2-only ON OFF)" - ) - cmake-multilib_src_configure -} - -multilib_src_install() { - cmake_src_install - cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc -}diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild@@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library" -HOMEPAGE="http://freeglut.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="debug static-libs wayland-only gles2-only" - -RDEPEND=" - !wayland-only? ( - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.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}] - ) - wayland-only? ( - media-libs/mesa[egl(+),${MULTILIB_USEDEP}] - dev-libs/wayland[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - ) - !gles2-only? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - gles2-only? ( media-libs/mesa[gles1,gles2,${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - !wayland-only? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.1-opengl-cmake.patch -) - -src_configure() { - local mycmakeargs=( - "-DFREEGLUT_BUILD_DEMOS=OFF" - "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" - "-DFREEGLUT_WAYLAND=$(usex wayland-only ON OFF)" - "-DFREEGLUT_GLES=$(usex gles2-only ON OFF)" - ) - cmake-multilib_src_configure -} - -multilib_src_install() { - cmake_src_install - cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die -}diff --git a/media-libs/freeglut/freeglut-3.4.0.ebuild b/media-libs/freeglut/freeglut-3.4.0.ebuild@@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library" +HOMEPAGE="http://freeglut.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug static-libs wayland-only gles2-only" + +RDEPEND=" + !wayland-only? ( + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.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}] + ) + wayland-only? ( + media-libs/mesa[egl(+),${MULTILIB_USEDEP}] + dev-libs/wayland[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon[${MULTILIB_USEDEP}] + ) + !gles2-only? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + gles2-only? ( media-libs/mesa[gles1,gles2,${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + !wayland-only? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-opengl-cmake.patch +) + +src_configure() { + local mycmakeargs=( + "-DFREEGLUT_BUILD_DEMOS=OFF" + "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" + "-DFREEGLUT_WAYLAND=$(usex wayland-only ON OFF)" + "-DFREEGLUT_GLES=$(usex gles2-only ON OFF)" + ) + cmake-multilib_src_configure +} + +multilib_src_install() { + cmake_src_install + cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die +}