diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
| commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
| tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /x11-apps/mesa-progs | |
| parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) | |
gentoo resync : 05.12.2021
Diffstat (limited to 'x11-apps/mesa-progs')
| -rw-r--r-- | x11-apps/mesa-progs/Manifest | 4 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild | 13 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-9999.ebuild | 13 |
3 files changed, 22 insertions, 8 deletions
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest index b8b0251e23c7..bba0fed2a6c4 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-r1.ebuild 1721 BLAKE2B db1205cd996f7518a80005faef5ebd5441c095cdf9d76e8e7f9416ad58730c578365596c6316d405bbad9765eff393baebb28716bfa6beb8909422aa91d0eaa7 SHA512 c475f89967cb74c8028f737f705cb2d0cafb17a364e0c3f762b88254ea850476a11ebb1258e0e508294fb218ada0d9c8e26bba8db8d893d97bdde0147d59639c -EBUILD mesa-progs-9999.ebuild 1684 BLAKE2B 08c5ac24193a320db47534c341748629c3b3b88e9fc9533e12a7dd5c6e925a9a3ee7a567f42fcb6a8bddada0537bb70b77b17cc716b76fc5a86d568eba26fb6d SHA512 0615a6a7a9f2782c22e846908ce52acc461cc2cec811ab93e3e42c10c3ab8f8f16be1e37c3151efc1844c21fea04e48792a1b72497de703386e4c83c609ae7dd +EBUILD mesa-progs-8.4.0-r1.ebuild 1938 BLAKE2B afb6f35321e54991b2c6dc8ff5332a039fd121004974eefc96bce976102caf5f45f6228984b3203360a4791177e741a48eb7dd37eb896679eb862ccf600dfada SHA512 56718a52c9d4de97a95312659edd4997a2f7221edf00654da1095699d1aa389f0e174e6edcb03f486e0beb914c6c893b7a12cfd62c87391e112e43a4f8964a98 +EBUILD mesa-progs-9999.ebuild 1901 BLAKE2B 5ff50ee415d4701d3696e456d6f227cc6b3153db7830d1a462c575915a57d573cda6c23e62bb418ea42d7ed004785b9435434b165a11cdbab844a08bb078a406 SHA512 754f4e34af00e3253e360c7a89b18b9d3590ab9cc66de400bde00764096853a0718fe2ef7125ac492cc31c72a6326d652e9416a91b1bc19a62212658881270e6 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 index ee75c1fc23ec..cafb05dd7c1a 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND} media-libs/glew virtual/glu x11-base/xorg-proto" +BDEPEND="sys-apps/grep + sys-apps/file" PATCHES=( "${FILESDIR}"/${P}-improve-printing.patch @@ -59,10 +61,15 @@ src_compile() { } src_install() { - dobin src/xdemos/{glxgears,glxinfo} + local demo='src/xdemos' if use egl; then - dobin src/egl/opengl/egl{info,gears_x11} + demo="${demo} src/egl/opengl" - use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} + use gles2 && demo="${demo} src/egl/opengles2" fi + + # Ensure only the binaries are installed and not a similarly named wrapper script + find ${demo} -type f -print0 | + xargs -0 file | grep executable | grep ELF | cut -f 1 -d : | + xargs -I '{}' dobin '{}' || die } diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 8da112519962..413b7365eaf8 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -32,6 +32,8 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/glu x11-base/xorg-proto" +BDEPEND="sys-apps/grep + sys-apps/file" src_prepare() { default @@ -55,10 +57,15 @@ src_compile() { } src_install() { - dobin src/xdemos/{glxgears,glxinfo} + local demo='src/xdemos' if use egl; then - dobin src/egl/opengl/egl{info,gears_x11} + demo="${demo} src/egl/opengl" - use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} + use gles2 && demo="${demo} src/egl/opengles2" fi + + # Ensure only the binaries are installed and not a similarly named wrapper script + find ${demo} -type f -print0 | + xargs -0 file | grep executable | grep ELF | cut -f 1 -d : | + xargs -I '{}' dobin '{}' || die } |