From fc2f1018fc323ef2c6572734a9b130427cba76a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Nov 2021 06:47:15 +0000 Subject: gentoo resync : 03.11.2021 --- x11-apps/mesa-progs/Manifest | 4 +- x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild | 68 ++++++++++++++++++++++++++ x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild | 68 -------------------------- x11-apps/mesa-progs/mesa-progs-9999.ebuild | 2 +- 4 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild delete mode 100644 x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild (limited to 'x11-apps/mesa-progs') diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest index 053d6bb5dff4..b8b0251e23c7 100644 --- a/x11-apps/mesa-progs/Manifest +++ b/x11-apps/mesa-progs/Manifest @@ -1,5 +1,5 @@ AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 -EBUILD mesa-progs-8.4.0.ebuild 1718 BLAKE2B 7fd08f256a361072a7a3ab48d7bad60157b2d8d86c5c0808bf537fc98be643f39595beef9665e1366ece5ea771a08896209817878740ad0129798e3668cb7be2 SHA512 59e9cf34fc8a3537d1180089b95cc1c181fa7b61668921f621f9850d67a6607308349e86e9dc9f91b4cb1c8f62592d12b8280ac2eea73ea259a37b519e970814 -EBUILD mesa-progs-9999.ebuild 1681 BLAKE2B 227a3748e2db925aba7f7d835d38edae60a384915d52c3c3bf7f116137881738093acfcd5c0f8dcf19cbbbbb103b6ffb31cf817525aac3cfc5d5eae89e1f3d9c SHA512 076a0020f376683bfd3b1bb8de5c4d534bfda8b77d6a0386033b22157d99ec3797418e57f665c36a80f577e37327cec82f0f40a69e9e8438807f3717f479c76d +EBUILD mesa-progs-8.4.0-r1.ebuild 1721 BLAKE2B db1205cd996f7518a80005faef5ebd5441c095cdf9d76e8e7f9416ad58730c578365596c6316d405bbad9765eff393baebb28716bfa6beb8909422aa91d0eaa7 SHA512 c475f89967cb74c8028f737f705cb2d0cafb17a364e0c3f762b88254ea850476a11ebb1258e0e508294fb218ada0d9c8e26bba8db8d893d97bdde0147d59639c +EBUILD mesa-progs-9999.ebuild 1684 BLAKE2B 08c5ac24193a320db47534c341748629c3b3b88e9fc9533e12a7dd5c6e925a9a3ee7a567f42fcb6a8bddada0537bb70b77b17cc716b76fc5a86d568eba26fb6d SHA512 0615a6a7a9f2782c22e846908ce52acc461cc2cec811ab93e3e42c10c3ab8f8f16be1e37c3151efc1844c21fea04e48792a1b72497de703386e4c83c609ae7dd MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6 diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild new file mode 100644 index 000000000000..ee75c1fc23ec --- /dev/null +++ b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PN="${PN/progs/demos}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos" +if [[ ${PV} = 9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git" + EGIT_CHECKOUT_DIR="${S}" + EXPERIMENTAL="true" +else + SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2 + https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/${MY_P}" +fi +LICENSE="LGPL-2" +SLOT="0" +IUSE="egl gles2" + +RDEPEND=" + media-libs/mesa[egl(+)?,gles2?] + virtual/opengl + x11-libs/libX11" +DEPEND="${RDEPEND} + media-libs/glew + virtual/glu + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-improve-printing.patch +) + +src_prepare() { + default + [[ ${PV} = 9999* ]] && eautoreconf +} + +src_compile() { + emake -C src/xdemos glxgears glxinfo + + if use egl; then + emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo + emake -C src/egl/eglut/ libeglut_x11.la + emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11 + + if use gles2; then + emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info + emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11 + fi + fi +} + +src_install() { + dobin src/xdemos/{glxgears,glxinfo} + if use egl; then + dobin src/egl/opengl/egl{info,gears_x11} + + use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} + fi +} diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild deleted file mode 100644 index 82c9e0060ca3..000000000000 --- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PN="${PN/progs/demos}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos" -if [[ ${PV} = 9999* ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git" - EGIT_CHECKOUT_DIR="${S}" - EXPERIMENTAL="true" -else - SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2 - https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi -LICENSE="LGPL-2" -SLOT="0" -IUSE="egl gles2" - -RDEPEND=" - media-libs/mesa[egl?,gles2?] - virtual/opengl - x11-libs/libX11" -DEPEND="${RDEPEND} - media-libs/glew - virtual/glu - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${P}-improve-printing.patch -) - -src_prepare() { - default - [[ ${PV} = 9999* ]] && eautoreconf -} - -src_compile() { - emake -C src/xdemos glxgears glxinfo - - if use egl; then - emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo - emake -C src/egl/eglut/ libeglut_x11.la - emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11 - - if use gles2; then - emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info - emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11 - fi - fi -} - -src_install() { - dobin src/xdemos/{glxgears,glxinfo} - if use egl; then - dobin src/egl/opengl/egl{info,gears_x11} - - use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} - fi -} diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 3f1df0ab2b36..8da112519962 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -26,7 +26,7 @@ SLOT="0" IUSE="egl gles2" RDEPEND=" - media-libs/mesa[egl?,gles2?] + media-libs/mesa[egl(+)?,gles2?] virtual/opengl x11-libs/libX11" DEPEND="${RDEPEND} -- cgit v1.2.3