From 107f6d3889a9e5e50fd039355491b9e58b5c95b2 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 3 May 2021 18:33:36 -0400 Subject: media-libs/freeglut: Revbump Closes: https://bugs.gentoo.org/773478 Signed-off-by: Matt Turner --- media-libs/freeglut/freeglut-3.2.1-r1.ebuild | 48 ++++++++++++++++++++++++++++ media-libs/freeglut/freeglut-3.2.1.ebuild | 48 ---------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 media-libs/freeglut/freeglut-3.2.1-r1.ebuild delete mode 100644 media-libs/freeglut/freeglut-3.2.1.ebuild diff --git a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild b/media-libs/freeglut/freeglut-3.2.1-r1.ebuild new file mode 100644 index 000000000000..8cac34cf3c48 --- /dev/null +++ b/media-libs/freeglut/freeglut-3.2.1-r1.ebuild @@ -0,0 +1,48 @@ +# 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.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild deleted file mode 100644 index 8cac34cf3c48..000000000000 --- a/media-libs/freeglut/freeglut-3.2.1.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 -} -- cgit v1.2.3-65-gdbad