[gentoo-commits] repo/gentoo:master commit in: media-libs/glu/files/, media-libs/glu/
commit: b25eab4c71fa4ed2fb4fc556810897e8b8423ad8 Author: Matt Turner gentoo org> AuthorDate: Tue Sep 5 19:15:32 2023 + Commit: Matt Turner gentoo org> CommitDate: Tue Sep 5 20:28:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25eab4c media-libs/glu: Drop old versions Signed-off-by: Matt Turner gentoo.org> media-libs/glu/Manifest| 1 - .../glu/files/glu-9.0.2-clang-16-register.patch| 30 media-libs/glu/glu-9.0.2.ebuild| 41 -- 3 files changed, 72 deletions(-) diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest index 037938c1394a..d46a5efadcbb 100644 --- a/media-libs/glu/Manifest +++ b/media-libs/glu/Manifest @@ -1,2 +1 @@ -DIST glu-9.0.2.tar.xz 436176 BLAKE2B 90485938e4809ce7bb56da25bd60be9f3f7b7f40d511ea6635e40d749e519d1dca6241d891224d3cf331b911f545df4ef9aa2101baf4e3b18df69244edbcb8a4 SHA512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64 DIST glu-9.0.3.tar.xz 218968 BLAKE2B a6fc842004dcca4243ef285e26806afdfb931d21985ad8f9a3f03f438e66b810718bf04e588044ed8db0e49f806d346dc2ce69cfa91450f046a4dfa39136 SHA512 b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba diff --git a/media-libs/glu/files/glu-9.0.2-clang-16-register.patch b/media-libs/glu/files/glu-9.0.2-clang-16-register.patch deleted file mode 100644 index c06d893f1151.. --- a/media-libs/glu/files/glu-9.0.2-clang-16-register.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/894314 -https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10 - -From b6c308172993dfd0f76ee9f4fe083cff8c51ced8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 13 Jan 2023 20:58:07 -0800 -Subject: [PATCH] Remove deprecated register in C++17 - -Fixes errors like - -src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] -register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); -^ - -Signed-off-by: Khem Raj a/src/libnurbs/internals/varray.cc -+++ b/src/libnurbs/internals/varray.cc -@@ -73,8 +73,8 @@ Varray::~Varray( void ) - inline void - Varray::update( Arc_ptr arc, long dir[2], REAL val ) - { --register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); --register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); -+long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); -+long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); - - if( dir[0] != ds || dir[1] != dt ) { - dir[0] = ds; --- -GitLab diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild deleted file mode 100644 index 080aba661db9.. --- a/media-libs/glu/glu-9.0.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git; - -if [[ ${PV} = * ]]; then - GIT_ECLASS="git-r3" -fi - -inherit meson-multilib ${GIT_ECLASS} - -DESCRIPTION="The OpenGL Utility Library" -HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu; - -if [[ ${PV} = * ]]; then - SRC_URI="" -else - SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -fi - -LICENSE="SGI-B-2.0" -SLOT="0" -IUSE="static-libs" - -DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-9.0.2-clang-16-register.patch -) - -multilib_src_configure() { - local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) - -Dgl_provider=glvnd - ) - meson_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glu/files/, media-libs/glu/
commit: 9c81ebf8c454cc218fa59993c95e92689a628639 Author: Sam James gentoo org> AuthorDate: Tue Feb 14 22:55:29 2023 + Commit: Sam James gentoo org> CommitDate: Tue Feb 14 23:03:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c81ebf8 media-libs/glu: fix build w/ clang 16 Closes: https://bugs.gentoo.org/894314 Signed-off-by: Sam James gentoo.org> .../glu/files/glu-9.0.2-clang-16-register.patch| 30 ++ media-libs/glu/glu-9.0.2.ebuild| 6 - 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/media-libs/glu/files/glu-9.0.2-clang-16-register.patch b/media-libs/glu/files/glu-9.0.2-clang-16-register.patch new file mode 100644 index ..c06d893f1151 --- /dev/null +++ b/media-libs/glu/files/glu-9.0.2-clang-16-register.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/894314 +https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10 + +From b6c308172993dfd0f76ee9f4fe083cff8c51ced8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 13 Jan 2023 20:58:07 -0800 +Subject: [PATCH] Remove deprecated register in C++17 + +Fixes errors like + +src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] +register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); +^ + +Signed-off-by: Khem Raj +--- a/src/libnurbs/internals/varray.cc b/src/libnurbs/internals/varray.cc +@@ -73,8 +73,8 @@ Varray::~Varray( void ) + inline void + Varray::update( Arc_ptr arc, long dir[2], REAL val ) + { +-register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); +-register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); ++long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); ++long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); + + if( dir[0] != ds || dir[1] != dt ) { + dir[0] = ds; +-- +GitLab diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild index da35e84be92a..bb010d61a62e 100644 --- a/media-libs/glu/glu-9.0.2.ebuild +++ b/media-libs/glu/glu-9.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,10 @@ IUSE="static-libs" DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-9.0.2-clang-16-register.patch +) + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(usex static-libs both shared)