commit: 5c8df2080a700ab49e52337e8ee4424178961d31 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Wed May 1 20:12:42 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed May 1 23:35:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8df208
x11-misc/virtualgl: EAPI=7, install to /usr/lib/VirtualGL, add dep on libXtst Closes: https://bugs.gentoo.org/683656 Closes: https://bugs.gentoo.org/679710 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../virtualgl/{virtualgl-9999.ebuild => virtualgl-2.6.1-r1.ebuild} | 6 ++++-- x11-misc/virtualgl/virtualgl-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild similarity index 94% copy from x11-misc/virtualgl/virtualgl-9999.ebuild copy to x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild index 05ef6a70377..baca3aa9453 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-multilib flag-o-matic multilib systemd if [[ ${PV} == *9999 ]] ; then @@ -30,6 +30,7 @@ RDEPEND=" media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] x11-libs/libXv[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] @@ -37,6 +38,7 @@ RDEPEND=" >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] @@ -62,7 +64,7 @@ src_configure() { -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir) + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) ) diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild index 05ef6a70377..baca3aa9453 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-multilib flag-o-matic multilib systemd if [[ ${PV} == *9999 ]] ; then @@ -30,6 +30,7 @@ RDEPEND=" media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] x11-libs/libXv[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] @@ -37,6 +38,7 @@ RDEPEND=" >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] @@ -62,7 +64,7 @@ src_configure() { -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir) + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
