| 1 |
commit: 5c8df2080a700ab49e52337e8ee4424178961d31 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 20:12:42 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 23:35:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8df208 |
| 7 |
|
| 8 |
x11-misc/virtualgl: EAPI=7, install to /usr/lib/VirtualGL, add dep on libXtst |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/683656 |
| 11 |
Closes: https://bugs.gentoo.org/679710 |
| 12 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 13 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 14 |
|
| 15 |
.../virtualgl/{virtualgl-9999.ebuild => virtualgl-2.6.1-r1.ebuild} | 6 ++++-- |
| 16 |
x11-misc/virtualgl/virtualgl-9999.ebuild | 6 ++++-- |
| 17 |
2 files changed, 8 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
| 20 |
similarity index 94% |
| 21 |
copy from x11-misc/virtualgl/virtualgl-9999.ebuild |
| 22 |
copy to x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
| 23 |
index 05ef6a70377..baca3aa9453 100644 |
| 24 |
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild |
| 25 |
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
| 26 |
@@ -1,7 +1,7 @@ |
| 27 |
# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=6 |
| 31 |
+EAPI=7 |
| 32 |
inherit cmake-multilib flag-o-matic multilib systemd |
| 33 |
|
| 34 |
if [[ ${PV} == *9999 ]] ; then |
| 35 |
@@ -30,6 +30,7 @@ RDEPEND=" |
| 36 |
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] |
| 37 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 38 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
| 39 |
+ x11-libs/libXtst[${MULTILIB_USEDEP}] |
| 40 |
x11-libs/libXv[${MULTILIB_USEDEP}] |
| 41 |
virtual/glu[${MULTILIB_USEDEP}] |
| 42 |
virtual/opengl[${MULTILIB_USEDEP}] |
| 43 |
@@ -37,6 +38,7 @@ RDEPEND=" |
| 44 |
>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] |
| 45 |
>=x11-libs/libX11-1.6.2[abi_x86_32] |
| 46 |
>=x11-libs/libXext-1.3.2[abi_x86_32] |
| 47 |
+ >=x11-libs/libXtst-1.2.3[abi_x86_32] |
| 48 |
>=x11-libs/libXv-1.0.10[abi_x86_32] |
| 49 |
>=virtual/glu-9.0-r1[abi_x86_32] |
| 50 |
>=virtual/opengl-7.0-r1[abi_x86_32] |
| 51 |
@@ -62,7 +64,7 @@ src_configure() { |
| 52 |
-DVGL_USESSL="$(usex ssl)" |
| 53 |
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" |
| 54 |
-DTJPEG_INCLUDE_DIR=/usr/include |
| 55 |
- -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir) |
| 56 |
+ -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL |
| 57 |
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so |
| 58 |
-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) |
| 59 |
) |
| 60 |
|
| 61 |
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild |
| 62 |
index 05ef6a70377..baca3aa9453 100644 |
| 63 |
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild |
| 64 |
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild |
| 65 |
@@ -1,7 +1,7 @@ |
| 66 |
# Copyright 1999-2019 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
-EAPI=6 |
| 70 |
+EAPI=7 |
| 71 |
inherit cmake-multilib flag-o-matic multilib systemd |
| 72 |
|
| 73 |
if [[ ${PV} == *9999 ]] ; then |
| 74 |
@@ -30,6 +30,7 @@ RDEPEND=" |
| 75 |
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] |
| 76 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 77 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
| 78 |
+ x11-libs/libXtst[${MULTILIB_USEDEP}] |
| 79 |
x11-libs/libXv[${MULTILIB_USEDEP}] |
| 80 |
virtual/glu[${MULTILIB_USEDEP}] |
| 81 |
virtual/opengl[${MULTILIB_USEDEP}] |
| 82 |
@@ -37,6 +38,7 @@ RDEPEND=" |
| 83 |
>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] |
| 84 |
>=x11-libs/libX11-1.6.2[abi_x86_32] |
| 85 |
>=x11-libs/libXext-1.3.2[abi_x86_32] |
| 86 |
+ >=x11-libs/libXtst-1.2.3[abi_x86_32] |
| 87 |
>=x11-libs/libXv-1.0.10[abi_x86_32] |
| 88 |
>=virtual/glu-9.0-r1[abi_x86_32] |
| 89 |
>=virtual/opengl-7.0-r1[abi_x86_32] |
| 90 |
@@ -62,7 +64,7 @@ src_configure() { |
| 91 |
-DVGL_USESSL="$(usex ssl)" |
| 92 |
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" |
| 93 |
-DTJPEG_INCLUDE_DIR=/usr/include |
| 94 |
- -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir) |
| 95 |
+ -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL |
| 96 |
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so |
| 97 |
-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) |
| 98 |
) |
Archives