diff options
Diffstat (limited to 'media-libs/freeglut')
| -rw-r--r-- | media-libs/freeglut/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch | 81 | ||||
| -rw-r--r-- | media-libs/freeglut/freeglut-3.2.1-r2.ebuild | 48 | ||||
| -rw-r--r-- | media-libs/freeglut/freeglut-3.2.2.ebuild | 2 |
4 files changed, 2 insertions, 134 deletions
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest index 0c919c73c559..e1c9c4feda64 100644 --- a/media-libs/freeglut/Manifest +++ b/media-libs/freeglut/Manifest @@ -1,6 +1,3 @@ -AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b -DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9 -EBUILD freeglut-3.2.1-r2.ebuild 1499 BLAKE2B 5fe6ab2def7d44b129fe22ed721303324e5deda66a0d572e990760371cf6c661cd0804a2db8b3c7e876b2834d027bb0bd01727655f86d468f7a638a8ed097bdb SHA512 321c424e287b5e4b0a1e1f7c02f34639b952a85ca4ca81f8f8479b732bd47ad93d8d141dd00ba61cfbed4bdadfeabf70e2608e02acdd6a5195b15d84da088957 -EBUILD freeglut-3.2.2.ebuild 1415 BLAKE2B 79da6e517e0d5558fbe75acb32a310e672fdf4a6b87bbade2320da0f83441d81d853c549eb11ba676c5e510626943fba39e5e986a4577f0fdba5607d0fd69761 SHA512 e5f739ffc6dcf1e4a3fe839442ab5bd767ea247d1004965ed837537fbe8fc50e9f0956e3441a2a5354e9480ffae4684d3b88cb214c894caa60585c54c7e7956b +EBUILD freeglut-3.2.2.ebuild 1418 BLAKE2B ba39423769e8625cd765175e57cdae6988a4a7940f732cc3c61281af47a010d0c5fa72f6c716bf12683e7638610ed2ab29d10f4342ac9a5bed6a45dfff082b50 SHA512 df7ba88f571cb1f2a5563213f579b3dde1b969d62c5f36bd318f1baf04815c9071e8a4baf6aa658c18dafda90a3efea51a43264951b5dc881b8d4637ff43d55c MISC metadata.xml 529 BLAKE2B ef8eb49e76fa342486804eb88393b0b80710761c9255e8971f99cd40a41cdfa7ac4734d66a2d2b285d9493ae9b6c56706235749f4958985e15bb22796a81908b SHA512 fe290b4e32aaecbc3f604adf0ef295d8fb1e9a2dee4fd4c3b61a56a82e4d6c4395cb6b6e4e91a6c196d632cf65102539d8f91dd7556ab7d63e539866d83dc8e5 diff --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 deleted file mode 100644 index 655c01bf94b4..000000000000 --- a/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch +++ /dev/null @@ -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-r2.ebuild b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild deleted file mode 100644 index f99b7bafeb9e..000000000000 --- a/media-libs/freeglut/freeglut-3.2.1-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug static-libs" - -# 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/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}]" -# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] ) -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc10-fno-common.patch ) -HTML_DOCS=( doc/. ) - -src_configure() { - local mycmakeargs=( -# "-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006 - "-DFREEGLUT_GLES=OFF" - "-DFREEGLUT_BUILD_DEMOS=OFF" - "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON 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 -} diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild index 12a6c509bb4c..d8fb60843cac 100644 --- a/media-libs/freeglut/freeglut-3.2.2.ebuild +++ b/media-libs/freeglut/freeglut-3.2.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="static-libs" # enabling GLES support seems to cause build failures |