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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89BC215800A for ; Mon, 28 Aug 2023 16:14:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 972812BC015; Mon, 28 Aug 2023 16:14:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 7DC672BC013 for ; Mon, 28 Aug 2023 16:14:56 +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 62435335CEC for ; Mon, 28 Aug 2023 16:14:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B82C1076 for ; Mon, 28 Aug 2023 16:14:53 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1693239248.33911b9e7d5718cac1134cdfbf861466d17035a4.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glew/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/glew/glew-1.10.0-r100.ebuild media-libs/glew/glew-1.10.0-r101.ebuild media-libs/glew/glew-1.6.0-r100.ebuild media-libs/glew/glew-1.6.0-r101.ebuild media-libs/glew/glew-2.2.0-r1.ebuild X-VCS-Directories: media-libs/glew/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 33911b9e7d5718cac1134cdfbf861466d17035a4 X-VCS-Branch: master Date: Mon, 28 Aug 2023 16:14:53 +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: 5cad956e-ec76-42e1-9fa1-e26709667eef X-Archives-Hash: c7f014b0d390584b30b7c8e7e9a96e4a commit: 33911b9e7d5718cac1134cdfbf861466d17035a4 Author: James Le Cuirot gentoo org> AuthorDate: Sat Feb 18 22:57:18 2023 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Aug 28 16:14:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33911b9e media-libs/glew: EAPI 8 Signed-off-by: James Le Cuirot gentoo.org> ...-1.10.0-r100.ebuild => glew-1.10.0-r101.ebuild} | 6 +- ...ew-1.6.0-r100.ebuild => glew-1.6.0-r101.ebuild} | 6 +- media-libs/glew/glew-2.2.0-r1.ebuild | 100 +++++++++++++++++++++ 3 files changed, 106 insertions(+), 6 deletions(-) diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r101.ebuild similarity index 94% rename from media-libs/glew/glew-1.10.0-r100.ebuild rename to media-libs/glew/glew-1.10.0-r101.ebuild index 449a8130f3d2..d577b1e7ea0c 100644 --- a/media-libs/glew/glew-1.10.0-r100.ebuild +++ b/media-libs/glew/glew-1.10.0-r101.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib-minimal toolchain-funcs versionator +EAPI=8 +inherit multilib-minimal toolchain-funcs DESCRIPTION="The OpenGL Extension Wrangler Library" HOMEPAGE="https://glew.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD MIT" -SLOT="$(get_version_component_range 1-2)" +SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r101.ebuild similarity index 94% rename from media-libs/glew/glew-1.6.0-r100.ebuild rename to media-libs/glew/glew-1.6.0-r101.ebuild index 8d79d12f3cc0..9bb6892b4030 100644 --- a/media-libs/glew/glew-1.6.0-r100.ebuild +++ b/media-libs/glew/glew-1.6.0-r101.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib-minimal toolchain-funcs versionator +EAPI=8 +inherit multilib-minimal toolchain-funcs DESCRIPTION="The OpenGL Extension Wrangler Library" HOMEPAGE="https://glew.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD MIT" -SLOT="$(get_version_component_range 1-2)" +SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" diff --git a/media-libs/glew/glew-2.2.0-r1.ebuild b/media-libs/glew/glew-2.2.0-r1.ebuild new file mode 100644 index 000000000000..249e40d44cd4 --- /dev/null +++ b/media-libs/glew/glew-2.2.0-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs + +DESCRIPTION="The OpenGL Extension Wrangler Library" +HOMEPAGE="https://glew.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="BSD MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="doc static-libs" + +DEPEND=" + >=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/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${PN}-2.0.0-install-headers.patch + ) + + sed -i \ + -e '/INSTALL/s:-s::' \ + -e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ + -e '/^.PHONY: .*\.pc$/d' \ + Makefile || die + + if ! use static-libs ; then + sed -i \ + -e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \ + -e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \ + -e '/INSTALL.*LIB.STATIC/d' \ + Makefile || die + fi + + # don't do stupid Solaris specific stuff that won't work in Prefix + cp config/Makefile.linux config/Makefile.solaris || die + + default + multilib_copy_sources +} + +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + +set_opts() { + myglewopts=( + AR="$(tc-getAR)" + STRIP=true + CC="$(tc-getCC)" + LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" + M_ARCH="" + LDFLAGS.EXTRA="" + POPT="${CFLAGS}" + ) +} + +multilib_src_compile() { + set_opts + emake \ + GLEW_PREFIX="${EPREFIX}/usr" \ + GLEW_DEST="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + "${myglewopts[@]}" +} + +multilib_src_install() { + set_opts + emake \ + GLEW_DEST="${ED}/usr" \ + LIBDIR="${ED}/usr/$(get_libdir)" \ + PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \ + "${myglewopts[@]}" \ + install.all + + dodoc README.md + if use doc; then + docinto html + dodoc -r doc + fi +}