commit: d505e67d91d83213e07a4862589c08640b2b5fa1 parent 9e3fda2106fbe65b1cccaff009df89179012b834 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Mon, 9 Nov 2020 19:30:00 +0100 media-libs/freeglut: Add wayland-only supportDiffstat:
| A | media-libs/freeglut/Manifest | 1 | + |
| A | media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch | 81 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | media-libs/freeglut/freeglut-3.2.1.ebuild | 51 | +++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | media-libs/freeglut/metadata.xml | 18 | ++++++++++++++++++ |
4 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest @@ -0,0 +1 @@ +DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 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 @@ -0,0 +1,81 @@ +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.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="debug static-libs wayland-only" + +RDEPEND="!wayland-only? ( + >=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}] + ) + wayland-only? ( + media-libs/mesa[egl,gles1,gles2,${MULTILIB_USEDEP}] + dev-libs/wayland[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND} + !wayland-only? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc10-fno-common.patch ) +HTML_DOCS=( doc/. ) + +src_configure() { + local mycmakeargs=( + "-DFREEGLUT_BUILD_DEMOS=OFF" + "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" + $(cmake-utils_use wayland-only FREEGLUT_WAYLAND) + $(cmake-utils_use wayland-only FREEGLUT_GLES) + ) + cmake-multilib_src_configure +} + +multilib_src_install() { + cmake-utils_src_install + cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc +} diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>contact@hacktivis.me</email> + </maintainer> + <longdescription> + Freeglut provides an open-source alternative to the OpenGL Utility Toolkit + (GLUT) library. It is actively developed and maintained, while not being + restricted by its license. +</longdescription> + <upstream> + <remote-id type="sourceforge">freeglut</remote-id> + </upstream> + <use> + <flag name="wayland-only">Link to wayland & EGL+GLES instead of libX11 & GL/GLX</flag> + </use> +</pkgmetadata>