Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/
Date: Sun, 29 Nov 2020 11:45:09
Message-Id: 1606650253.eaf6e0d34992b8b559fa0dd01446553cb42ef542.pacho@gentoo
1 commit: eaf6e0d34992b8b559fa0dd01446553cb42ef542
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 11:44:13 2020 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 11:44:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf6e0d3
7
8 x11-misc/virtualgl: Drop old
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 x11-misc/virtualgl/Manifest | 2 -
14 x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 97 ------------------------
15 x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild | 107 ---------------------------
16 3 files changed, 206 deletions(-)
17
18 diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
19 index 9a74632b228..475110d4645 100644
20 --- a/x11-misc/virtualgl/Manifest
21 +++ b/x11-misc/virtualgl/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
24 -DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
25 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
26 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
27
28 diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
29 deleted file mode 100644
30 index 15a2ad641c5..00000000000
31 --- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
32 +++ /dev/null
33 @@ -1,97 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -CMAKE_ECLASS=cmake
40 -inherit cmake-multilib flag-o-matic systemd
41 -
42 -if [[ ${PV} == *9999 ]] ; then
43 - EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
44 - inherit git-r3
45 -else
46 - MY_PN="VirtualGL"
47 - MY_P="${MY_PN}-${PV}"
48 - S="${WORKDIR}/${MY_P}"
49 - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
50 - KEYWORDS="amd64 ~arm64 x86"
51 -fi
52 -
53 -DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
54 -HOMEPAGE="https://www.virtualgl.org/"
55 -
56 -SLOT="0"
57 -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
58 -IUSE="libressl ssl"
59 -
60 -RDEPEND="
61 - ssl? (
62 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
63 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
64 - )
65 - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
66 - x11-libs/libX11[${MULTILIB_USEDEP}]
67 - x11-libs/libXext[${MULTILIB_USEDEP}]
68 - x11-libs/libXtst[${MULTILIB_USEDEP}]
69 - x11-libs/libXv[${MULTILIB_USEDEP}]
70 - virtual/glu[${MULTILIB_USEDEP}]
71 - virtual/opengl[${MULTILIB_USEDEP}]
72 - amd64? ( abi_x86_32? (
73 - >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
74 - >=x11-libs/libX11-1.6.2[abi_x86_32]
75 - >=x11-libs/libXext-1.3.2[abi_x86_32]
76 - >=x11-libs/libXtst-1.2.3[abi_x86_32]
77 - >=x11-libs/libXv-1.0.10[abi_x86_32]
78 - >=virtual/glu-9.0-r1[abi_x86_32]
79 - >=virtual/opengl-7.0-r1[abi_x86_32]
80 - ) )
81 -"
82 -DEPEND="${RDEPEND}"
83 -
84 -src_prepare() {
85 - # Use /var/lib, bug #428122
86 - sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
87 - server/vglrun.in server/vglgenkey server/vglserver_config || die
88 -
89 - cmake_src_prepare
90 -}
91 -
92 -src_configure() {
93 - # Completely breaks steam/wine for discrete graphics otherwise
94 - # see https://github.com/VirtualGL/virtualgl/issues/16
95 - append-ldflags "-Wl,--no-as-needed"
96 -
97 - abi_configure() {
98 - local mycmakeargs=(
99 - -DVGL_USESSL="$(usex ssl)"
100 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
101 - -DTJPEG_INCLUDE_DIR=/usr/include
102 - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
103 - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
104 - -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
105 - )
106 - cmake_src_configure
107 - }
108 - multilib_parallel_foreach_abi abi_configure
109 -}
110 -
111 -src_install() {
112 - cmake-multilib_src_install
113 -
114 - # Make config dir
115 - dodir /var/lib/VirtualGL
116 - fowners root:video /var/lib/VirtualGL
117 - fperms 0750 /var/lib/VirtualGL
118 - newinitd "${FILESDIR}/vgl.initd-r3" vgl
119 - newconfd "${FILESDIR}/vgl.confd-r2" vgl
120 -
121 - exeinto /usr/libexec
122 - doexe "${FILESDIR}/vgl-helper.sh"
123 - systemd_dounit "${FILESDIR}/vgl.service"
124 -
125 - # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
126 - mv "${D}"/usr/bin/{,v}glxinfo || die
127 -
128 - # Remove license files, bug 536284
129 - rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
130 -}
131
132 diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
133 deleted file mode 100644
134 index ed68cde9f2f..00000000000
135 --- a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
136 +++ /dev/null
137 @@ -1,107 +0,0 @@
138 -# Copyright 1999-2020 Gentoo Authors
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=7
142 -
143 -CMAKE_ECLASS=cmake
144 -inherit cmake-multilib flag-o-matic systemd
145 -
146 -if [[ ${PV} == *9999 ]] ; then
147 - EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
148 - inherit git-r3
149 -else
150 - MY_PN="VirtualGL"
151 - MY_P="${MY_PN}-${PV}"
152 - S="${WORKDIR}/${MY_P}"
153 - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
154 - KEYWORDS="~amd64 ~x86"
155 -fi
156 -
157 -DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
158 -HOMEPAGE="https://www.virtualgl.org/"
159 -
160 -SLOT="0"
161 -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
162 -IUSE="libressl ssl"
163 -
164 -RDEPEND="
165 - ssl? (
166 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
167 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
168 - )
169 - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
170 - x11-libs/libX11[${MULTILIB_USEDEP}]
171 - x11-libs/libXext[${MULTILIB_USEDEP}]
172 - x11-libs/libXtst[${MULTILIB_USEDEP}]
173 - x11-libs/libXv[${MULTILIB_USEDEP}]
174 - virtual/glu[${MULTILIB_USEDEP}]
175 - virtual/opencl[${MULTILIB_USEDEP}]
176 - virtual/opengl[${MULTILIB_USEDEP}]
177 - amd64? ( abi_x86_32? (
178 - >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
179 - >=x11-libs/libX11-1.6.2[abi_x86_32]
180 - >=x11-libs/libXext-1.3.2[abi_x86_32]
181 - >=x11-libs/libXtst-1.2.3[abi_x86_32]
182 - >=x11-libs/libXv-1.0.10[abi_x86_32]
183 - >=virtual/glu-9.0-r1[abi_x86_32]
184 - virtual/opencl[abi_x86_32]
185 - >=virtual/opengl-7.0-r1[abi_x86_32]
186 - ) )
187 -"
188 -DEPEND="${RDEPEND}"
189 -
190 -PATCHES=(
191 - # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
192 - "${FILESDIR}/${P}-mesa-19.3.patch"
193 -)
194 -
195 -src_prepare() {
196 - # Use /var/lib, bug #428122
197 - sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
198 - server/vglrun.in server/vglgenkey server/vglserver_config || die
199 -
200 - cmake_src_prepare
201 -}
202 -
203 -src_configure() {
204 - # Completely breaks steam/wine for discrete graphics otherwise
205 - # see https://github.com/VirtualGL/virtualgl/issues/16
206 - append-ldflags "-Wl,--no-as-needed"
207 -
208 - abi_configure() {
209 - local mycmakeargs=(
210 - -DVGL_USESSL="$(usex ssl)"
211 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
212 - -DTJPEG_INCLUDE_DIR=/usr/include
213 - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
214 - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
215 - -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
216 - )
217 - cmake_src_configure
218 - }
219 - multilib_parallel_foreach_abi abi_configure
220 -}
221 -
222 -src_install() {
223 - cmake-multilib_src_install
224 -
225 - # Make config dir
226 - dodir /var/lib/VirtualGL
227 - fowners root:video /var/lib/VirtualGL
228 - fperms 0750 /var/lib/VirtualGL
229 - newinitd "${FILESDIR}/vgl.initd-r3" vgl
230 - newconfd "${FILESDIR}/vgl.confd-r2" vgl
231 -
232 - exeinto /usr/libexec
233 - doexe "${FILESDIR}/vgl-helper.sh"
234 - systemd_dounit "${FILESDIR}/vgl.service"
235 -
236 - # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
237 - mv "${D}"/usr/bin/{,v}glxinfo || die
238 -
239 - # Remove license files, bug 536284
240 - rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
241 -
242 - # Directory is created if needed at runtime
243 - rm -r "${D}"/var/lib || die
244 -}