subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: x11\-misc\/virtualgl\/"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2024-07-12 Thread Arthur Zamarin

commit: 2065f0bb17fdbce4d2730debaa9623d4d421810d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 12 17:23:19 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 12 17:23:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2065f0bb

x11-misc/virtualgl: Stabilize 3.1.1 x86, #935894

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
index cff430281656..ecdc216b6cde 100644
--- a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"

SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz";
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2024-07-12 Thread Arthur Zamarin

commit: e6eca504695aaf899f9869d74d9c7696e4c8ee6a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 12 17:23:18 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 12 17:23:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6eca504

x11-misc/virtualgl: Stabilize 3.1.1 amd64, #935894

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
index 1b1bb38f63a8..cff430281656 100644
--- a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"

SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz";
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2024-05-18 Thread Sam James

commit: fb0c186bf29acf526e63416c222bcdcf6124694b
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 16:08:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 16:08:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0c186b

x11-misc/virtualgl: Stabilize 3.1-r1 x86, #932148

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
index 406688c485be..5e5505059f3f 100644
--- a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"

SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz";
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2024-05-18 Thread Sam James

commit: 8b1a2dc72e30e9d0bd48fe7ff90cf32d1210acc8
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 15:35:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 15:35:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1a2dc7

x11-misc/virtualgl: Stabilize 3.1-r1 amd64, #932148

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
index 74caab53733f..406688c485be 100644
--- a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"

SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz";
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2024-05-18 Thread Pacho Ramos

commit: bccde7ae6a39188bbdbfb8e455842a7bdc86023c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May 18 10:15:48 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May 18 10:16:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccde7ae

x11-misc/virtualgl: fix pkgcheck warnings

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.1.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
index 41dde92c6219..1b1bb38f63a8 100644
--- a/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1.1.ebuild
@@ -18,10 +18,9 @@ fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
 HOMEPAGE="https://www.virtualgl.org/";
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
 
 SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE=""
 
 RDEPEND="
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2023-06-08 Thread Pacho Ramos

commit: afb10eb67adad4014ce18adae67a05594e6f11e8
Author: Brahmajit Das  gmail  com>
AuthorDate: Thu Jun  1 09:25:00 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jun  8 09:38:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb10eb6

x11-misc/virtualgl: Fix ISO C++17 does not allow register storage class 
specifier

Closes: https://bugs.gentoo.org/898876
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31261
Signed-off-by: Pacho Ramos  gentoo.org>

 .../files/virtualgl-3.1-drop-register.patch|  53 +++
 x11-misc/virtualgl/virtualgl-3.1-r1.ebuild | 101 +
 2 files changed, 154 insertions(+)

diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch 
b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
new file mode 100644
index ..5e7153c3c383
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
@@ -0,0 +1,53 @@
+https://github.com/VirtualGL/virtualgl/pull/233
+From: Brahmajit Das 
+Date: Thu, 1 Jun 2023 14:45:17 +0530
+Subject: [PATCH] Dropping use of register keyword
+
+The usage of register keyword was deprecated in c++14 and it's
+completely removed in c++17. Found will building virtualgl on gentoo
+with clang-16.
+
+Bug: https://bugs.gentoo.org/898876
+Signed-off-by: Brahmajit Das 
+--- a/server/fltk/src/Fl_Text_Buffer.cxx
 b/server/fltk/src/Fl_Text_Buffer.cxx
+@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char 
*string, int len ) {
+ ** routine if no substitution has been done.
+ */
+ void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) {
+-  register char * c, subsChar = mNullSubsChar;
++  char * c, subsChar = mNullSubsChar;
+ 
+   if ( subsChar == '\0' )
+ return;
+--- a/server/fltk/src/Fl_arg.cxx
 b/server/fltk/src/Fl_arg.cxx
+@@ -314,7 +314,7 @@ without express or implied warranty.
+ 
+ static int ReadInteger(char* string, char** NextString)
+ {
+-  register int Result = 0;
++  int Result = 0;
+   int Sign = 1;
+ 
+   if (*string == '+')
+@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y,
+  unsigned int* width, unsigned int* height)
+ {
+   int mask = NoValue;
+-  register char *strind;
++  char *strind;
+   unsigned int tempWidth = 0, tempHeight = 0;
+   int tempX = 0, tempY = 0;
+   char *nextCharacter;
+--- a/util/md5.c
 b/util/md5.c
+@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context 
*ctx)
+  */
+ void MD5Transform(uint32 buf[4], uint32 in[16])
+ {
+-  register uint32 a, b, c, d;
++  uint32 a, b, c, d;
+ 
+   a = buf[0];
+   b = buf[1];

diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
new file mode 100644
index ..479f441ae5f9
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE=""
+
+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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1-drop-register.patch
+)
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graph

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2023-04-18 Thread Conrad Kostecki

commit: e5edf90120faab5fe44ee48f7ada78193d0c0303
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Apr 18 16:33:12 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Apr 18 19:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5edf901

x11-misc/virtualgl: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30645
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/virtualgl-3.0.1-libX11-1.8.patch | 140 -
 1 file changed, 140 deletions(-)

diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch 
b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
deleted file mode 100644
index dd37d6c3b664..
--- a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
-From: DRC 
-Date: Thu, 7 Jul 2022 17:22:57 -0500
-Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
-
-Fixes #205

- ChangeLog.md   |  2 ++
- server/CMakeLists.txt  | 10 ++
- server/FakePbuffer.cpp |  2 +-
- server/faker-sym.h |  6 ++
- server/faker-x11.cpp   |  7 ++-
- server/faker.cpp   |  4 ++--
- 6 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 292a5a94..4b9cc36f 100644
 a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary 
drivers.  In some
- cases, this led to incorrect device permissions for **/dev/nvidia*** after the
- display manager was restarted.
- 
-+2. Fixed compilation errors when building with libX11 1.8.x.
-+
- 
- 3.0.1
- =
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 574521a0..2ce92856 100644
 a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -91,6 +91,16 @@ add_custom_command(OUTPUT 
${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
-   > ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
- 
-+include(CheckPrototypeDefinition)
-+set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
-+check_prototype_definition(XkbOpenDisplay
-+  "Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, 
int *)"
-+  NULL X11/XKBlib.h LIBX11_18)
-+unset(CMAKE_REQUIRED_INCLUDES)
-+if(LIBX11_18)
-+  add_definitions(-DLIBX11_18)
-+endif()
-+
- set(FAKER_SOURCES
-   backend.cpp
-   ContextHash.cpp
-diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
-index bfa55279..64aab775 100644
 a/server/FakePbuffer.cpp
-+++ b/server/FakePbuffer.cpp
-@@ -10,11 +10,11 @@
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- // wxWindows Library License for more details.
- 
-+#include 
- #include "FakePbuffer.h"
- #include "TempContextEGL.h"
- #include "BufferState.h"
- #include "ContextHashEGL.h"
--#include 
- 
- using namespace util;
- using namespace backend;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index 0fa1e5cd..3c6f94e8 100644
 a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, 
XNextEvent)
- 
- FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
- 
-+#ifdef LIBX11_18
-+FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
-+  int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
-+  int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
-+#else
- FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
-   int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
-   int *, reason_rtrn, XkbOpenDisplay)
-+#endif
- 
- FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
-   int *, major_opcode, int *, first_event, int *, first_error,
-diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
-index 99e8bf17..a233f3b1 100644
 a/server/faker-x11.cpp
-+++ b/server/faker-x11.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
-+// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified 
under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
- // within libX11, VirtualGL cannot intercept it on some platforms.  Thus we
- // need to interpose XkbOpenDisplay().
- 
-+#ifdef LIBX11_18
-+Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
-+  int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#else
- Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
-   int *major_in_out, int *minor_in_out, int *r

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2023-04-17 Thread Pacho Ramos

commit: aaf3b51f4553c6aafe5087a32cce7d442f6d48e2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Apr 17 13:29:57 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Apr 17 13:29:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf3b51f

x11-misc/virtualgl: add 3.1

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest |  1 +
 x11-misc/virtualgl/virtualgl-3.1.ebuild | 97 +
 2 files changed, 98 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index d9eec5b6ca96..621e257d4711 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
 DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 
7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f
 SHA512 
d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
 DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 
72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4
 SHA512 
fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
+DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 
556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627
 SHA512 
cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b

diff --git a/x11-misc/virtualgl/virtualgl-3.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.1.ebuild
new file mode 100644
index ..8b9679b59247
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE=""
+
+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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   keepdir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-12-01 Thread Jakov Smolić

commit: f5b53b6ffbabef0886413844f28fbe1d290c81d0
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:27:56 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:27:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b53b6f

x11-misc/virtualgl: Stabilize 3.0.2 x86, #883925

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
index 8361b1d0e936..8cb6671d67db 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-12-01 Thread Jakov Smolić

commit: 5048e7dbb00142f7fa428df00082ab48baa1c4e3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Dec  1 22:24:09 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec  1 22:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5048e7db

x11-misc/virtualgl: Stabilize 3.0.2 amd64, #883925

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
index a7d108eb3851..8361b1d0e936 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-10-23 Thread Pacho Ramos

commit: 76ccf0af91a096563c3eacbfb38b35e91a13bcdb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 23 15:56:54 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 23 16:06:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ccf0af

x11-misc/virtualgl: add 3.0.2

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest   |   1 +
 x11-misc/virtualgl/virtualgl-3.0.2.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 017d98d4d092..4053eaf60cdf 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
 DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 
7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f
 SHA512 
d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
+DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 
72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4
 SHA512 
fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
 DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B 
f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c
 SHA512 
9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98

diff --git a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
new file mode 100644
index ..a7d108eb3851
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="ssl"
+
+RDEPEND="
+   ssl? (
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   )
+   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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   keepdir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-10-23 Thread Pacho Ramos

commit: ce7b9c5ab75155c99555600f947abbd2b8126ec3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 23 15:57:16 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 23 16:06:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7b9c5a

x11-misc/virtualgl: drop 3.0-r1

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest|   1 -
 x11-misc/virtualgl/virtualgl-3.0-r1.ebuild | 101 -
 2 files changed, 102 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 4053eaf60cdf..d9eec5b6ca96 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,3 +1,2 @@
 DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 
7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f
 SHA512 
d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
 DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 
72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4
 SHA512 
fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
-DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B 
f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c
 SHA512 
9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98

diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
deleted file mode 100644
index 8cb6671d67db..
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-   ssl? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   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}]
-   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opencl[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   x11-libs/xcb-util-keysyms[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   virtual/opencl[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   keepdir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r4" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-08-15 Thread Joonas Niilola

commit: bd73ddf7098ff62fb469ceaff6deafab03329c61
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:29:45 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:32:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd73ddf7

x11-misc/virtualgl: Stabilize 3.0.1 amd64, #865181

Signed-off-by: Joonas Niilola  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index 6deb567c0970..9a089010a658 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-08-15 Thread Joonas Niilola

commit: 39ef8437d0d8a94735b672196260d9fb6d47226d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:30:26 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:32:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ef8437

x11-misc/virtualgl: Stabilize 3.0.1 x86, #865181

Signed-off-by: Joonas Niilola  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index 9a089010a658..b78a84a80c37 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-08-15 Thread Andreas Sturmlechner

commit: 06734486a98b5d903dcf35a0b75b82d8416e4cd2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 15 16:39:40 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 15 16:39:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06734486

x11-misc/virtualgl: Drop CMAKE_ECLASS meta var superfluous in EAPI-8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0-r1.ebuild | 1 -
 x11-misc/virtualgl/virtualgl-3.0.1.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
index 762d51d6aaab..8cb6671d67db 100644
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-CMAKE_ECLASS=cmake
 
 inherit cmake-multilib flag-o-matic systemd
 

diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index c29aac4b170f..6deb567c0970 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-CMAKE_ECLASS=cmake
 
 inherit cmake-multilib flag-o-matic systemd

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/

2022-07-20 Thread Pacho Ramos

commit: d2381a8ec1ffefc82269d3959a643940ba7aff84
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jul 20 13:11:30 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jul 20 13:11:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2381a8e

x11-misc/virtualgl: Fix build with latest libX11

Thanks-to: Toralf Förster
Thanks-to: Sam James
Closes: https://bugs.gentoo.org/856724
Signed-off-by: Pacho Ramos  gentoo.org>

 .../files/virtualgl-3.0.1-libX11-1.8.patch | 140 +
 x11-misc/virtualgl/virtualgl-3.0.1.ebuild  |   5 +
 2 files changed, 145 insertions(+)

diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch 
b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
new file mode 100644
index ..dd37d6c3b664
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
@@ -0,0 +1,140 @@
+From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Thu, 7 Jul 2022 17:22:57 -0500
+Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
+
+Fixes #205
+---
+ ChangeLog.md   |  2 ++
+ server/CMakeLists.txt  | 10 ++
+ server/FakePbuffer.cpp |  2 +-
+ server/faker-sym.h |  6 ++
+ server/faker-x11.cpp   |  7 ++-
+ server/faker.cpp   |  4 ++--
+ 6 files changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 292a5a94..4b9cc36f 100644
+--- a/ChangeLog.md
 b/ChangeLog.md
+@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary 
drivers.  In some
+ cases, this led to incorrect device permissions for **/dev/nvidia*** after the
+ display manager was restarted.
+ 
++2. Fixed compilation errors when building with libX11 1.8.x.
++
+ 
+ 3.0.1
+ =
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 574521a0..2ce92856 100644
+--- a/server/CMakeLists.txt
 b/server/CMakeLists.txt
+@@ -91,6 +91,16 @@ add_custom_command(OUTPUT 
${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
+   > ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
+ 
++include(CheckPrototypeDefinition)
++set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
++check_prototype_definition(XkbOpenDisplay
++  "Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, 
int *)"
++  NULL X11/XKBlib.h LIBX11_18)
++unset(CMAKE_REQUIRED_INCLUDES)
++if(LIBX11_18)
++  add_definitions(-DLIBX11_18)
++endif()
++
+ set(FAKER_SOURCES
+   backend.cpp
+   ContextHash.cpp
+diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
+index bfa55279..64aab775 100644
+--- a/server/FakePbuffer.cpp
 b/server/FakePbuffer.cpp
+@@ -10,11 +10,11 @@
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ // wxWindows Library License for more details.
+ 
++#include 
+ #include "FakePbuffer.h"
+ #include "TempContextEGL.h"
+ #include "BufferState.h"
+ #include "ContextHashEGL.h"
+-#include 
+ 
+ using namespace util;
+ using namespace backend;
+diff --git a/server/faker-sym.h b/server/faker-sym.h
+index 0fa1e5cd..3c6f94e8 100644
+--- a/server/faker-sym.h
 b/server/faker-sym.h
+@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, 
XNextEvent)
+ 
+ FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
+ 
++#ifdef LIBX11_18
++FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
++  int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
++  int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
++#else
+ FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
+   int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
+   int *, reason_rtrn, XkbOpenDisplay)
++#endif
+ 
+ FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
+   int *, major_opcode, int *, first_event, int *, first_error,
+diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
+index 99e8bf17..a233f3b1 100644
+--- a/server/faker-x11.cpp
 b/server/faker-x11.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
++// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified 
under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
+ // within libX11, VirtualGL cannot intercept it on some platforms.  Thus we
+ // need to interpose XkbOpenDisplay().
+ 
++#ifdef LIBX11_18
++Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
++  int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
++#else
+ Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
+   int *major_in_out,

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-07-10 Thread Sam James

commit: db022136068ee16067aece8fd82793df2a584423
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 13:08:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 14:39:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db022136

x11-misc/virtualgl: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 1142ff475214..36f31c1c4446 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -22,6 +22,7 @@
the ability to run OpenGL applications with full 3D hardware 
acceleration.


+   virtualgl/virtualgl
virtualgl

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-05-22 Thread Pacho Ramos

commit: 4cdb0095996fe0d92a74fa7cedd43860dbad4b9b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 22 11:04:07 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 22 11:04:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdb0095

x11-misc/virtualgl: drop 2.6.5-r4

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest  |   1 -
 x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild | 100 ---
 2 files changed, 101 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index ba78e1ee3441..017d98d4d092 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,3 +1,2 @@
-DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
 DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 
7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f
 SHA512 
d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
 DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B 
f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c
 SHA512 
9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
deleted file mode 100644
index 367b55b3cc79..
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-   ssl? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   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}]
-   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opencl[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   x11-libs/xcb-util-keysyms[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   virtual/opencl[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   keepdir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r4" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-05-22 Thread Pacho Ramos

commit: 36989bc43ca387eba20e213d142e5bbfbda5d785
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 22 11:03:50 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 22 11:03:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36989bc4

x11-misc/virtualgl: add 3.0.1

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest   |   1 +
 x11-misc/virtualgl/virtualgl-3.0.1.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 87e3548f1331..ba78e1ee3441 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
+DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 
7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f
 SHA512 
d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
 DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B 
f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c
 SHA512 
9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98

diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
new file mode 100644
index ..bdd5c8a49e50
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="ssl"
+
+RDEPEND="
+   ssl? (
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   )
+   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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   keepdir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/l

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-05-04 Thread Sam James

commit: 0d726926675b8e44f7473bbdcf6bc7400fff0ef1
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 22:31:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  4 22:31:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d726926

x11-misc/virtualgl: Stabilize 3.0-r1 x86, #842600

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
index 9eaf3b90069a..ff63188223a7 100644
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2022-05-04 Thread Sam James

commit: 0f554d0055fb9c0b9c81933b55f95805dee8a7d6
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 22:31:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  4 22:31:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f554d00

x11-misc/virtualgl: Stabilize 3.0-r1 amd64, #842600

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
index ff63188223a7..762d51d6aaab 100644
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-12-22 Thread Pacho Ramos

commit: 2eb93feb58f6cfed74dbcc7e5d4559039078c226
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Dec 22 10:30:07 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Dec 22 10:30:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb93feb

x11-misc/virtualgl: Avoid file collision with mesa-progs[egl]

Thanks-to: Edgar Dragon
Closes: https://bugs.gentoo.org/829792
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/{virtualgl-3.0.ebuild => virtualgl-3.0-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-3.0.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
similarity index 96%
rename from x11-misc/virtualgl/virtualgl-3.0.ebuild
rename to x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
index 284d9b318933..9eaf3b90069a 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -93,7 +93,9 @@ src_install() {
systemd_dounit "${FILESDIR}/vgl.service"
 
# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   # and eglinfo to veglinto because of conflict with mesa-progs[egl]
mv "${D}"/usr/bin/{,v}glxinfo || die
+   mv "${D}"/usr/bin/{,v}eglinfo || die
 
# Remove license files, bug 536284
rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-12-21 Thread Pacho Ramos

commit: ad8911fe8312afbba19b4f0c6e9cfb3d044f670a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Dec 21 18:24:54 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Dec 21 18:25:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8911fe

x11-misc/virtualgl: Bump to 3.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest |   1 +
 x11-misc/virtualgl/virtualgl-3.0.ebuild | 100 
 2 files changed, 101 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index a868d4cd7b87..87e3548f1331 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1 +1,2 @@
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
+DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B 
f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c
 SHA512 
9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98

diff --git a/x11-misc/virtualgl/virtualgl-3.0.ebuild 
b/x11-misc/virtualgl/virtualgl-3.0.ebuild
new file mode 100644
index ..284d9b318933
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="ssl"
+
+RDEPEND="
+   ssl? (
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   )
+   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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   keepdir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-05-08 Thread Pacho Ramos

commit: 3ff215ee830c3d49099c1cc03afda1f33984136b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May  8 08:29:48 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May  8 09:27:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff215ee

x11-misc/virtualgl: Stabilize

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
index e1a99a022b8..367b55b3cc7 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-05-08 Thread Pacho Ramos

commit: 01e95243094f35f583a8df89accfee2772c96a67
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May  8 08:29:08 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May  8 09:27:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e95243

x11-misc/virtualgl: Fix /var/lib/VirtualGL creation

Thanks-to: Bogdan
Closes: https://bugs.gentoo.org/782682
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild | 100 +++
 1 file changed, 100 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
new file mode 100644
index 000..e1a99a022b8
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="ssl"
+
+RDEPEND="
+   ssl? (
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   )
+   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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   keepdir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2021-05-08 Thread Pacho Ramos

commit: 3a3221c5dadfff490dad55998471b8e3a2497b8d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May  8 08:31:31 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May  8 09:27:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3221c5

x11-misc/virtualgl: Drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest  |   1 -
 x11-misc/virtualgl/files/vgl.initd-r3|  45 
 x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild | 103 ---
 x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild | 103 ---
 x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild | 103 ---
 5 files changed, 355 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 475110d4645..a868d4cd7b8 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1 @@
-DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 
34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3
 SHA512 
a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532

diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 
b/x11-misc/virtualgl/files/vgl.initd-r3
deleted file mode 100644
index 951d73287d2..000
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: description="*" and other OpenRC 0.9+ candies
-
-depend() {
-   need xdm
-   after sshd
-}
-
-start() {
-   ebegin "Starting VirtualGL"
-   truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
-
-  set_xauth
-
-  if [ -z "$XAUTHORITY" ]; then
-
-einfo "Waiting for xauthority..."
-
-# wait for xauth file
-while true; do 
-  set_xauth
-
-  if [ -e "$XAUTHORITY" ]; then
-break;
-  fi
-
-  sleep 1
-done 
-  fi
-
-
-   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f 
$XAUTHORITY list | awk '{print $3;exit}') && \
-   chmod 644 /var/lib/VirtualGL/vgl_xauth_key
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping VirtualGL"
-   [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
-   rm /var/lib/VirtualGL/vgl_xauth_key
-   eend $?
-}

diff --git a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
deleted file mode 100644
index e01895a2c0f..000
--- a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-   ssl? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   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}]
-   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opencl[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   x11-libs/xcb-util-keysyms[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   virtual/opencl[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in ser

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-05-08 Thread Pacho Ramos

commit: 1362825d42ec60123b1ae35bb0697e2da3b9f741
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May  8 08:30:44 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May  8 09:27:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1362825d

x11-misc/virtualgl: Nobody is maintaining the live ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-.ebuild | 96 
 1 file changed, 96 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-.ebuild 
b/x11-misc/virtualgl/virtualgl-.ebuild
deleted file mode 100644
index 66a5b007035..000
--- a/x11-misc/virtualgl/virtualgl-.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-   ssl? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   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}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   dodir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r4" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-   doexe "${FILESDIR}/vgl-helper.sh"
-   systemd_dounit "${FILESDIR}/vgl.service"
-
-   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-   mv "${D}"/usr/bin/{,v}glxinfo || die
-
-   # Remove license files, bug 536284
-   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-05-01 Thread Mikle Kolyada

commit: 6b986e4990caf5303b7b2c3bc82773ed0859ed56
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  1 09:50:26 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  1 09:53:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b986e49

x11-misc/virtualgl: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild | 7 +++
 x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild | 5 ++---
 x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild | 5 ++---
 x11-misc/virtualgl/virtualgl-.ebuild | 5 ++---
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
index 0778a983fa1..e01895a2c0f 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/";
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef88432..e01895a2c0f 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/";
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
index a7857fad033..73e5a82a2e3 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/";
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-misc/virtualgl/virtualgl-.ebuild 
b/x11-misc/virtualgl/virtualgl-.ebuild
index c464597e5bc..66a5b007035 100644
--- a/x11-misc/virtualgl/virtualgl-.ebuild
+++ b/x11-misc/virtualgl/virtualgl-.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/";
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-04-12 Thread Sam James

commit: a6d829f625f096c48e380a97e7f4f065b80d1ca6
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 17:33:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 17:33:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d829f6

x11-misc/virtualgl: Stabilize 2.6.5-r3 x86, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
index 03e53ce161a..a7857fad033 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-04-12 Thread Sam James

commit: 480a142b468edde2c2cdb761f5f7c45f49f4097d
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 17:32:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 17:32:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480a142b

x11-misc/virtualgl: Stabilize 2.6.5-r3 amd64, #768039

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
index 62e7240015f..03e53ce161a 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-03-26 Thread Sam James

commit: 471b713cbfb87a2fe97f6998006161cc0e0642bc
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 11:23:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 11:25:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471b713c

x11-misc/virtualgl: use d-m-i in ~arch

Fixes: 98316eb4fdd1a10f317e2938413331c9434b4132
Reported-by: Pacho Ramos  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../virtualgl/{virtualgl-2.6.5-r2.ebuild => virtualgl-2.6.5-r3.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
similarity index 98%
rename from x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild
rename to x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
index fe80c079e42..62e7240015f 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -86,7 +86,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
exeinto /usr/libexec

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-03-25 Thread Sam James

commit: 98316eb4fdd1a10f317e2938413331c9434b4132
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 15:39:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 15:42:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98316eb4

x11-misc/virtualgl: only depend on display-manager-init in ~arch

Fixes: 1607d107ea8254e32d059ce4b9c4375f9608e6f7
Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild  | 2 +-
 .../{virtualgl-2.6.5-r1.ebuild => virtualgl-2.6.5-r2.ebuild}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index a7857fad033..f537ef88432 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
@@ -86,7 +86,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
exeinto /usr/libexec

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild
similarity index 97%
copy from x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
copy to x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild
index a7857fad033..fe80c079e42 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 x86"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
@@ -86,7 +86,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r4" vgl
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
exeinto /usr/libexec

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2021-03-24 Thread Matt Turner

commit: 1607d107ea8254e32d059ce4b9c4375f9608e6f7
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Feb 13 02:04:17 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 24 16:06:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1607d107

x11-misc/virtualgl: revbump for d-m-i

Signed-off-by: Aisha Tammy  aisha.cc>
Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/virtualgl/files/vgl.initd-r4  | 45 ++
 ...algl-2.6.5.ebuild => virtualgl-2.6.5-r1.ebuild} |  2 +-
 x11-misc/virtualgl/virtualgl-.ebuild   |  4 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/x11-misc/virtualgl/files/vgl.initd-r4 
b/x11-misc/virtualgl/files/vgl.initd-r4
new file mode 100644
index 000..d40686266e0
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r4
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+   need display-manager
+   after sshd
+}
+
+start() {
+   ebegin "Starting VirtualGL"
+   truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+  set_xauth
+
+  if [ -z "$XAUTHORITY" ]; then
+
+einfo "Waiting for xauthority..."
+
+# wait for xauth file
+while true; do 
+  set_xauth
+
+  if [ -e "$XAUTHORITY" ]; then
+break;
+  fi
+
+  sleep 1
+done 
+  fi
+
+
+   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f 
$XAUTHORITY list | awk '{print $3;exit}') && \
+   chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping VirtualGL"
+   [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+   rm /var/lib/VirtualGL/vgl_xauth_key
+   eend $?
+}

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
similarity index 98%
rename from x11-misc/virtualgl/virtualgl-2.6.5.ebuild
rename to x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef88432..a7857fad033 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
@@ -86,7 +86,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
exeinto /usr/libexec

diff --git a/x11-misc/virtualgl/virtualgl-.ebuild 
b/x11-misc/virtualgl/virtualgl-.ebuild
index b1f2ed56343..c464597e5bc 100644
--- a/x11-misc/virtualgl/virtualgl-.ebuild
+++ b/x11-misc/virtualgl/virtualgl-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -82,7 +82,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newinitd "${FILESDIR}/vgl.initd-r4" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
exeinto /usr/libexec

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2021-02-14 Thread Sam James

commit: 330c408ff7f56a97e9db2256e1f9a5e9e23e5d64
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 19:52:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 19:52:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330c408f

x11-misc/virtualgl: Stabilize 2.6.5 x86, #770562

Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
index 7decbf89ae3..38ff0e24746 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2020-12-26 Thread Andreas Sturmlechner

commit: ca0df93ff051c586cd5002f3d55989e759ad2cc6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Dec 24 08:57:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 26 21:13:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0df93f

x11-misc/virtualgl: remove unused patch

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18803
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/virtualgl-2.6.3-mesa-19.3.patch  | 105 -
 1 file changed, 105 deletions(-)

diff --git a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch 
b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
deleted file mode 100644
index 6f45ba8a3ff..000
--- a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001
-From: DRC 
-Date: Thu, 13 Feb 2020 19:11:46 -0600
-Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers
-
-Mesa changed the signatures for glXGetTransparentIndexSUN() and
-glXQueryGLXPbufferSGIX() to match the official GLX extension specs:
-https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt
-https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt
-
-Reference:
-https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f
-
-Fixes #109

- ChangeLog.md |  2 ++
- server/faker-glx.cpp | 14 +-
- server/faker-sym.h   |  8 +++-
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 8d092bd7..78391d06 100644
 a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -6,6 +6,8 @@
- 1. VirtualGL now works properly with 3D applications that use the
- `glDrawBuffers()` function and render to the front buffer.
- 
-+2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and 
later.
-+
- 
- 2.6.3
- =
-diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp
-index faea37b6..6e7beb63 100644
 a/server/faker-glx.cpp
-+++ b/server/faker-glx.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2019 D. R. Commander
-+// Copyright (C)2009, 2011-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified 
under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, 
int attribute,
-   CATCH();
- }
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
-+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
-+  unsigned int *value)
-+#else
- int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
-   unsigned int *value)
-+#endif
- {
-   glXQueryDrawable(dpy, pbuf, attribute, value);
-+  #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 2019
-   return 0;
-+  #endif
- }
- 
- 
-@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
- 
- // Returns the transparent index from the overlay visual on the 2D X server
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
-+int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
-+  unsigned long *transparentIndex)
-+#else
- int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
-   long *transparentIndex)
-+#endif
- {
-   int retval = False;
-   XWindowAttributes xwa;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index b9aa30d0..0168ac7b 100644
 a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified 
under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, 
Display *, dpy,
- 
- // GLX_SUN_get_transparent_index
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
-+FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
-+  Window, underlay, unsigned long *, transparentIndex,
-+  glXGetTransparentIndexSUN)
-+#else
- FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
-   Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
-+#endif
- 
- 
- // GL functions

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-11-29 Thread Pacho Ramos

commit: 24db39575522f6d5743f489fc5a5b98857f56500
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 29 11:43:00 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 29 11:43:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24db3957

x11-misc/virtualgl: Bump to 2.6.5

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest   |   1 +
 x11-misc/virtualgl/virtualgl-2.6.5.ebuild | 104 ++
 2 files changed, 105 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 1fce81202c1..9a74632b228 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,3 +1,4 @@
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
 DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B 
d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e
 SHA512 
c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 
34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3
 SHA512 
a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
+DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
new file mode 100644
index 000..7decbf89ae3
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   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}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   virtual/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-11-29 Thread Pacho Ramos

commit: eaf6e0d34992b8b559fa0dd01446553cb42ef542
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 29 11:44:13 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 29 11:44:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf6e0d3

x11-misc/virtualgl: Drop old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest  |   2 -
 x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |  97 
 x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild | 107 ---
 3 files changed, 206 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 9a74632b228..475110d4645 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,4 +1,2 @@
-DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B 
d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e
 SHA512 
c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 
34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3
 SHA512 
a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 
4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c
 SHA512 
0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532

diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
deleted file mode 100644
index 15a2ad641c5..000
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
-
-RDEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
-   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}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake_src_configure
-   }
-   multilib_paralle

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-07-25 Thread Pacho Ramos

commit: 17eaaeae2f1582d14b677645b10dd6da444eee1f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul 25 14:16:12 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul 25 14:16:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17eaaeae

x11-misc/virtualgl: Add missing dependency

Closes: https://bugs.gentoo.org/733596
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Pacho Ramos  gentoo.org>

 .../virtualgl/{virtualgl-2.6.4.ebuild => virtualgl-2.6.4-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
similarity index 97%
rename from x11-misc/virtualgl/virtualgl-2.6.4.ebuild
rename to x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
index d63519582c6..9537fa119f1 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXtst[${MULTILIB_USEDEP}]
x11-libs/libXv[${MULTILIB_USEDEP}]
+   x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
virtual/glu[${MULTILIB_USEDEP}]
virtual/opencl[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
@@ -43,6 +44,7 @@ RDEPEND="
>=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]
+   x11-libs/xcb-util-keysyms[abi_x86_32]
>=virtual/glu-9.0-r1[abi_x86_32]
virtual/opencl[abi_x86_32]
>=virtual/opengl-7.0-r1[abi_x86_32]

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-07-24 Thread Sam James

commit: 7d9cbe6d167f3ba2d709a564684d729b6c765090
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 24 12:17:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 24 12:23:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9cbe6d

x11-misc/virtualgl: amd64 stable (bug #733596)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
index ec1b128132e..d63519582c6 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-06-27 Thread Pacho Ramos

commit: 0d86eb0c44d6146398a27d35cf401494f87e98b6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 27 10:44:24 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 27 10:48:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d86eb0c

x11-misc/virtualgl: Drop old

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.3.ebuild | 105 --
 1 file changed, 105 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
deleted file mode 100644
index 223864f51a2..000
--- a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
-   inherit git-r3
-else
-   MY_PN="VirtualGL"
-   MY_P="${MY_PN}-${PV}"
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
-
-RDEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
-   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}]
-   amd64? ( abi_x86_32? (
-   >=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]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
-   "${FILESDIR}/${P}-mesa-19.3.patch"
-)
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   dodir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-   doexe "${FILESDIR}/vgl-helper.sh"
-   systemd_dounit "${FILESDIR}/vgl.service"
-
-   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-   mv "${D}"/usr/bin/{,v}glxinfo || die
-
-   # Remove license files, bug 536284
-   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-
-   # Directory is created if needed at runtime
-   rm -r "${D}"/var/lib || die
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-06-27 Thread Pacho Ramos

commit: 7f0b0afd1b50d4b0b8be37c29acf23ed36a0413b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 27 10:43:59 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 27 10:48:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0b0afd

x11-misc/virtualgl: Bump to 2.6.4

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest   |   1 +
 x11-misc/virtualgl/virtualgl-2.6.4.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 6dc518141bf..1fce81202c1 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
 DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B 
d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e
 SHA512 
c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
+DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 
34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3
 SHA512 
a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280

diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
new file mode 100644
index 000..ec1b128132e
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   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/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.co

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-06-06 Thread Pacho Ramos

commit: 26376e9ef5d68cdec9487a316d685c3d92907720
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun  6 15:57:57 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun  6 15:58:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26376e9e

x11-misc/virtualgl: opencl is now required always on Linux

Closes: https://bugs.gentoo.org/727302
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild | 107 +++
 1 file changed, 107 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
new file mode 100644
index 000..ed68cde9f2f
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   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/opencl[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/opencl[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
+   "${FILESDIR}/${P}-mesa-19.3.patch"
+)
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+
+   # Directory is created if needed at runtime
+   rm -r "${D}"/var/lib || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2020-06-05 Thread Pacho Ramos

commit: 62f7a283d2c4e2d738a99d7d6b09ced2ee450e57
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jun  5 07:06:06 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jun  5 07:06:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f7a283

x11-misc/virtualgl: Add forgotten patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 .../files/virtualgl-2.6.3-mesa-19.3.patch  | 105 +
 1 file changed, 105 insertions(+)

diff --git a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch 
b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
new file mode 100644
index 000..6f45ba8a3ff
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
@@ -0,0 +1,105 @@
+From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Thu, 13 Feb 2020 19:11:46 -0600
+Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers
+
+Mesa changed the signatures for glXGetTransparentIndexSUN() and
+glXQueryGLXPbufferSGIX() to match the official GLX extension specs:
+https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt
+https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt
+
+Reference:
+https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f
+
+Fixes #109
+---
+ ChangeLog.md |  2 ++
+ server/faker-glx.cpp | 14 +-
+ server/faker-sym.h   |  8 +++-
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 8d092bd7..78391d06 100644
+--- a/ChangeLog.md
 b/ChangeLog.md
+@@ -6,6 +6,8 @@
+ 1. VirtualGL now works properly with 3D applications that use the
+ `glDrawBuffers()` function and render to the front buffer.
+ 
++2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and 
later.
++
+ 
+ 2.6.3
+ =
+diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp
+index faea37b6..6e7beb63 100644
+--- a/server/faker-glx.cpp
 b/server/faker-glx.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011-2019 D. R. Commander
++// Copyright (C)2009, 2011-2020 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified 
under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, 
int attribute,
+   CATCH();
+ }
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
++void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
++  unsigned int *value)
++#else
+ int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
+   unsigned int *value)
++#endif
+ {
+   glXQueryDrawable(dpy, pbuf, attribute, value);
++  #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 2019
+   return 0;
++  #endif
+ }
+ 
+ 
+@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
+ 
+ // Returns the transparent index from the overlay visual on the 2D X server
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
++int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
++  unsigned long *transparentIndex)
++#else
+ int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
+   long *transparentIndex)
++#endif
+ {
+   int retval = False;
+   XWindowAttributes xwa;
+diff --git a/server/faker-sym.h b/server/faker-sym.h
+index b9aa30d0..0168ac7b 100644
+--- a/server/faker-sym.h
 b/server/faker-sym.h
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander
++// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified 
under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, 
Display *, dpy,
+ 
+ // GLX_SUN_get_transparent_index
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 2019
++FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
++  Window, underlay, unsigned long *, transparentIndex,
++  glXGetTransparentIndexSUN)
++#else
+ FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
+   Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
++#endif
+ 
+ 
+ // GL functions

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-06-04 Thread Pacho Ramos

commit: bfe0f63035e65abb388446c149a8028628b6120e
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jun  4 20:33:37 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jun  4 20:33:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe0f630

x11-misc/virtualgl: Bump to 2.6.3

Closes: https://bugs.gentoo.org/696768
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/Manifest   |   1 +
 x11-misc/virtualgl/virtualgl-2.6.3.ebuild | 105 ++
 2 files changed, 106 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index c4b923bbf6c..6dc518141bf 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1 +1,2 @@
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
+DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B 
d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e
 SHA512 
c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea

diff --git a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
new file mode 100644
index 000..223864f51a2
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   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}]
+   amd64? ( abi_x86_32? (
+   >=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]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
+   "${FILESDIR}/${P}-mesa-19.3.patch"
+)
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2020-06-04 Thread Pacho Ramos

commit: 04c6106ca48af1af4676fe75509339d610c1be2c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jun  4 20:30:35 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jun  4 20:30:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c6106c

x11-misc/virtualgl: Co-maintain

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 x11-misc/virtualgl/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 332a759..9262412c8f8 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -5,6 +5,10 @@
np-hard...@gentoo.org
NP-Hardass

+   
+   pa...@gentoo.org
+   Pacho Ramos
+   

rei4...@gmail.com
My Th

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2019-12-23 Thread David Seifert

commit: 6156592b3249381c17ae4d55f2804376f0ce4dff
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec 23 06:47:09 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 23 10:15:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6156592b

x11-misc/virtualgl: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/14098
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 ...-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch | 168 -
 1 file changed, 168 deletions(-)

diff --git 
a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
 
b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
deleted file mode 100644
index d5d923f89d1..000
--- 
a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Patch modified to apply to VirtualGL 2.5.2, before
-1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
-
-
-From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
-From: DRC 
-Date: Mon, 16 Apr 2018 15:06:07 -0500
-Subject: [PATCH] OpenSSL improvements
-
-- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
-  provides CRYPTO_set_locking_callback(), since locking is now performed
-  internally.)
-- Detect whether the platform has /dev/urandom at compile time, rather
-  than assuming that all Sun and SGI machines don't have it (Solaris 10
-  and later supports /dev/urandom.)

- ChangeLog.md|  2 ++
- include/Socket.h|  8 ++--
- util/CMakeLists.txt |  5 +
- util/Socket.cpp | 25 -
- 4 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 3632c1d8..5c9bff84 100644
 a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call 
`glBlendFuncSeparate()`.
- VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
- unless the FB config has a corresponding visual on the 3D X server.
- 
-+6. VirtualGL can now be built and run with OpenSSL 1.1.
-+
- 
- 2.5.2
- =
-diff --git a/include/Socket.h b/include/Socket.h
-index dfe45e3a..f7409956 100644
 a/include/Socket.h
-+++ b/include/Socket.h
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
-  * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 D. R. Commander
-  *
-  * This library is free software and may be redistributed and/or modified 
under
-  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -23,7 +23,7 @@
- #endif
- #include 
- #include 
--#if defined(sun) || defined(sgi)
-+#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
- #include 
- #endif
- #endif
-@@ -161,15 +161,19 @@ namespace vglutil
- 
-   #ifdef USESSL
- 
-+  #if OPENSSL_VERSION_NUMBER < 0x1010L
-   static void lockingCallback(int mode, int type, const 
char *file,
-   int line)
-   {
-   if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
-   else cryptoLock[type].unlock();
-   }
-+  #endif
- 
-   static bool sslInit;
-+  #if OPENSSL_VERSION_NUMBER < 0x1010L
-   static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
-+  #endif
-   bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
- 
-   #endif
-diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
-index 65ef59e7..ed1dfb39 100644
 a/util/CMakeLists.txt
-+++ b/util/CMakeLists.txt
-@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
- add_executable(pftest pftest.c)
- target_link_libraries(pftest vglutil)
- 
-+if(EXISTS /dev/urandom)
-+  message(STATUS "Using /dev/urandom for random number generation")
-+  add_definitions(-DHAVE_DEVURANDOM)
-+endif()
-+
- add_library(vglsocket STATIC Socket.cpp)
- target_link_libraries(vglsocket vglutil)
- if(WIN32)
-diff --git a/util/Socket.cpp b/util/Socket.cpp
-index 0d230841..b41c25e9 100644
 a/util/Socket.cpp
-+++ b/util/Socket.cpp
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
-  * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 D. R. Commander
-  *
-  * This library is free software and may be redistributed and/or modified 
under
-  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
- 
- #ifdef USESSL
- bool Socket::sslInit=false;
-+#if OPENSSL_VERSION_NUMBER < 0x101

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-11-20 Thread Andreas Sturmlechner

commit: e870815760902f7bdeeaa31e954c53291d3d074d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 20 11:33:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 20 12:21:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8708157

x11-misc/virtualgl: Drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/virtualgl/Manifest  |  1 -
 x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild | 91 ---
 x11-misc/virtualgl/virtualgl-2.6.1.ebuild| 93 
 3 files changed, 185 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index bde00332663..c4b923bbf6c 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1 @@
-DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 
2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6
 SHA512 
a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
deleted file mode 100644
index 6b5db86e75b..000
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="https://www.virtualgl.org/";
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
-   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libXv[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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/libXv-1.0.10[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-PATCHES=(
-   
"${FILESDIR}/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch"
-)
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake-utils_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   dodir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-   doexe "${FILESDIR}/vgl-helper.sh"
-   systemd_dounit "${FILESDIR}/vgl.service"
-
-   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-   mv "${D}"/usr/bin/{,v}glxinfo || die
-
-   # Remove license files, bug 536284
-   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}

diff --git a/x11-misc/virtualgl/virtualgl-2.6.1.ebuild 
b/x11-m

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-11-19 Thread Agostino Sarubbo

commit: fac2213fa57dd062982281b2b355ba12b638fb76
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 19 12:48:14 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 19 12:48:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac2213f

x11-misc/virtualgl: x86 stable wrt bug #700292

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index ad7c07230d8..90a64046885 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -12,7 +12,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-11-18 Thread Agostino Sarubbo

commit: f763e524254d8c46f9cb03d084cbd70fd86ceea2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Nov 18 11:50:02 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Nov 18 11:50:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f763e524

x11-misc/virtualgl: amd64 stable wrt bug #700292

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index baca3aa9453..ad7c07230d8 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -12,7 +12,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-06-05 Thread Andreas Sturmlechner

commit: 584c0731c8acb1a7822d7664164360f02ac90646
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun  5 09:04:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  5 09:19:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=584c0731

x11-misc/virtualgl: Drop 2.5.2 (r0)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.5.2.ebuild | 88 ---
 1 file changed, 88 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
deleted file mode 100644
index 7b5b05a5b7c..000
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="http://www.virtualgl.org/";
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
-   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libXv[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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/libXv-1.0.10[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   # Completely breaks steam/wine for discrete graphics otherwise
-   # see https://github.com/VirtualGL/virtualgl/issues/16
-   append-ldflags "-Wl,--no-as-needed"
-
-   abi_configure() {
-   local mycmakeargs=(
-   -DVGL_USESSL="$(usex ssl)"
-   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   )
-   cmake-utils_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   dodir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-   doexe "${FILESDIR}/vgl-helper.sh"
-   systemd_dounit "${FILESDIR}/vgl.service"
-
-   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-   mv "${D}"/usr/bin/{,v}glxinfo || die
-
-   # Remove license files, bug 536284
-   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-06-05 Thread Agostino Sarubbo

commit: 8f866b5c8a0caa77f9d68dacc24e5ac55d7378f4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 07:45:24 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 07:45:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f866b5c

x11-misc/virtualgl: x86 stable wrt bug #684858

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
index 6b08d7ef9f4..6b5db86e75b 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-06-04 Thread Agostino Sarubbo

commit: 689bb22a0e2c53c5f0b54191cf13c20b488f8053
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 06:47:14 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 06:47:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689bb22a

x11-misc/virtualgl: amd64 stable wrt bug #684858

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
index aa35612ba1b..6b08d7ef9f4 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-05-01 Thread Craig Andrews

commit: 5c8df2080a700ab49e52337e8ee4424178961d31
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed May  1 20:12:42 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed May  1 23:35:28 2019 +
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  gentoo.org>

 .../virtualgl/{virtualgl-.ebuild => virtualgl-2.6.1-r1.ebuild}  | 6 --
 x11-misc/virtualgl/virtualgl-.ebuild| 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
similarity index 94%
copy from x11-misc/virtualgl/virtualgl-.ebuild
copy to x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index 05ef6a70377..baca3aa9453 100644
--- a/x11-misc/virtualgl/virtualgl-.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} == * ]] ; 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-.ebuild 
b/x11-misc/virtualgl/virtualgl-.ebuild
index 05ef6a70377..baca3aa9453 100644
--- a/x11-misc/virtualgl/virtualgl-.ebuild
+++ b/x11-misc/virtualgl/virtualgl-.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} == * ]] ; 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)
)

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-01-11 Thread Craig Andrews

commit: dc2083cd338db0dea15ae78549e2d608edc96c02
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jan 11 21:27:32 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Jan 11 21:30:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2083cd

x11-misc/virtualgl: 2.6.1 version bump

Closes: https://bugs.gentoo.org/show_bug.cgi?id=674072
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>

 x11-misc/virtualgl/Manifest   |  1 +
 x11-misc/virtualgl/virtualgl-2.6.1.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 02e239a09cf..bde00332663 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1 +1,2 @@
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 
2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6
 SHA512 
a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
+DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 
62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd
 SHA512 
36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5

diff --git a/x11-misc/virtualgl/virtualgl-2.6.1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
new file mode 100644
index 000..05ef6a70377
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2019-01-11 Thread Craig Andrews

commit: 74eced9102a1189d33f113ac5b0ad3149930b048
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jan  9 16:08:31 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Jan 11 21:30:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eced91

x11-misc/virtualgl: OpenSSL 1.1 compatibility

Closes: https://bugs.gentoo.org/673988
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>

 ...-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch | 168 +
 x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild   |  91 +++
 2 files changed, 259 insertions(+)

diff --git 
a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
 
b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
new file mode 100644
index 000..d5d923f89d1
--- /dev/null
+++ 
b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
@@ -0,0 +1,168 @@
+Patch modified to apply to VirtualGL 2.5.2, before
+1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
+
+
+From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Mon, 16 Apr 2018 15:06:07 -0500
+Subject: [PATCH] OpenSSL improvements
+
+- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
+  provides CRYPTO_set_locking_callback(), since locking is now performed
+  internally.)
+- Detect whether the platform has /dev/urandom at compile time, rather
+  than assuming that all Sun and SGI machines don't have it (Solaris 10
+  and later supports /dev/urandom.)
+---
+ ChangeLog.md|  2 ++
+ include/Socket.h|  8 ++--
+ util/CMakeLists.txt |  5 +
+ util/Socket.cpp | 25 -
+ 4 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 3632c1d8..5c9bff84 100644
+--- a/ChangeLog.md
 b/ChangeLog.md
+@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call 
`glBlendFuncSeparate()`.
+ VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
+ unless the FB config has a corresponding visual on the 3D X server.
+ 
++6. VirtualGL can now be built and run with OpenSSL 1.1.
++
+ 
+ 2.5.2
+ =
+diff --git a/include/Socket.h b/include/Socket.h
+index dfe45e3a..f7409956 100644
+--- a/include/Socket.h
 b/include/Socket.h
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified 
under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -23,7 +23,7 @@
+ #endif
+ #include 
+ #include 
+-#if defined(sun) || defined(sgi)
++#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
+ #include 
+ #endif
+ #endif
+@@ -161,15 +161,19 @@ namespace vglutil
+ 
+   #ifdef USESSL
+ 
++  #if OPENSSL_VERSION_NUMBER < 0x1010L
+   static void lockingCallback(int mode, int type, const 
char *file,
+   int line)
+   {
+   if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
+   else cryptoLock[type].unlock();
+   }
++  #endif
+ 
+   static bool sslInit;
++  #if OPENSSL_VERSION_NUMBER < 0x1010L
+   static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
++  #endif
+   bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
+ 
+   #endif
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 65ef59e7..ed1dfb39 100644
+--- a/util/CMakeLists.txt
 b/util/CMakeLists.txt
+@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
+ add_executable(pftest pftest.c)
+ target_link_libraries(pftest vglutil)
+ 
++if(EXISTS /dev/urandom)
++  message(STATUS "Using /dev/urandom for random number generation")
++  add_definitions(-DHAVE_DEVURANDOM)
++endif()
++
+ add_library(vglsocket STATIC Socket.cpp)
+ target_link_libraries(vglsocket vglutil)
+ if(WIN32)
+diff --git a/util/Socket.cpp b/util/Socket.cpp
+index 0d230841..b41c25e9 100644
+--- a/util/Socket.cpp
 b/util/Socket.cpp
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified 
under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
+ 
+ #ifdef USESSL
+ bool Socket::ss

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2019-01-11 Thread Craig Andrews

commit: c219a8ee4df4cc3a762225316d8c4236ed995e51
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jan 11 21:29:21 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Jan 11 21:30:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c219a8ee

x11-misc/virtualgl: Add - live version

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>

 x11-misc/virtualgl/virtualgl-.ebuild | 93 
 1 file changed, 93 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-.ebuild 
b/x11-misc/virtualgl/virtualgl-.ebuild
new file mode 100644
index 000..05ef6a70377
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git";
+   inherit git-r3
+else
+   MY_PN="VirtualGL"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="https://www.virtualgl.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2018-06-09 Thread Mart Raudsepp

commit: 6826194cf153ca99b2f9b7907df0acbb349c9dc0
Author: Alex Bennée  linaro  org>
AuthorDate: Wed Jun  6 19:18:19 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jun  9 14:14:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6826194c

x11-misc/virtualgl: add ~arm64 keyword

 x11-misc/virtualgl/virtualgl-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index ba85f086bb2..7b5b05a5b7c 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2018-06-06 Thread Andreas Sturmlechner

commit: 53d10beaab1a9aa661faadae044610b01f09f2aa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  3 12:24:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 08:07:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d10bea

x11-misc/virtualgl: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/virtualgl/Manifest  |  2 -
 x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild | 85 
 x11-misc/virtualgl/virtualgl-2.5.1.ebuild| 84 ---
 3 files changed, 171 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index bc35172c348..02e239a09cf 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,3 +1 @@
-DIST VirtualGL-2.4.1.tar.gz 1116018 BLAKE2B 
b80977d530af8e60c6a0409d7240a1bfc0f218268db11e530a2f6c933ea23d23cfc4430e4f0dc801a9fe213a0d4767870f581704172a1402443c0541ea5c22d5
 SHA512 
b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
-DIST VirtualGL-2.5.1.tar.gz 1165255 BLAKE2B 
3b719d23e925baa5e94f8e20dd86e9c50337f3e9b514e34a7b956b7fffa2e8e64b2883e789137b3daf6819cb85294bbc912189c9267b6d170045222d80d1b4fb
 SHA512 
a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a54a21cddb80f1edc2f89abfe88a584321c46383d3654
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 
2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6
 SHA512 
a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
deleted file mode 100644
index 8cc8c1f711e..000
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="http://www.virtualgl.org/";
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-   )
-   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libXv[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=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/libXv-1.0.10[abi_x86_32]
-   >=virtual/glu-9.0-r1[abi_x86_32]
-   >=virtual/opengl-7.0-r1[abi_x86_32]
-   ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   # Use /var/lib, bug #428122
-   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
-   server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   abi_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use ssl VGL_USESSL)
-   -DVGL_DOCDIR=/usr/share/doc/"${PF}"
-   -DTJPEG_INCLUDE_DIR=/usr/include
-   -DVGL_LIBDIR=/usr/$(get_libdir)
-   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-   -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
-   )
-   cmake-utils_src_configure
-   }
-   multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   # Make config dir
-   dodir /var/lib/VirtualGL
-   fowners root:video /var/lib/VirtualGL
-   fperms 0750 /var/lib/VirtualGL
-   newinitd "${FILESDIR}/vgl.initd-r3" vgl
-   newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-   exeinto /usr/libexec
-   doexe "${FILESDIR}/vgl-helper.sh"
-   systemd_dounit "${FILESDIR}/vgl.service"
-
-   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-   mv "${D}"/usr/bin/{,v}glxinfo || die
-
-   # Remove license files, bug 536284
-   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}

diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild 
b/x11-misc/virtua

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2017-11-07 Thread Manuel Rüger

commit: 220e21be91c9c46d713bebadf5eb2ced08caa880
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Nov  7 13:17:19 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Nov  7 13:17:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220e21be

x11-misc/virtualgl: Stable on amd64

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 x11-misc/virtualgl/virtualgl-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index 2f0cd2f41b4..ba85f086bb2 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2017-11-02 Thread Thomas Deutschmann

commit: c1d374d9ea765ade1c0bbb1ffa531bd9b3cf5b9a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov  2 21:00:46 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov  2 21:13:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d374d9

x11-misc/virtualgl: x86 stable (bug #632368)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/virtualgl/virtualgl-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index 0c640fbb96e..2f0cd2f41b4 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2017-10-15 Thread David Seifert

commit: c769e5aa49ab9ebd503ec1af139032666c9c1426
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 03:31:40 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 03:31:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c769e5aa

x11-misc/virtualgl: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild | 4 ++--
 x11-misc/virtualgl/virtualgl-2.5.1.ebuild| 4 ++--
 x11-misc/virtualgl/virtualgl-2.5.2.ebuild| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
index 6df4d7616cb..8cc8c1f711e 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,7 +44,7 @@ src_prepare() {
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-   default
+   cmake-utils_src_prepare
 }
 
 src_configure() {

diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
index a90df85ec7a..39757c09b61 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ src_prepare() {
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-   default
+   cmake-utils_src_prepare
 }
 
 src_configure() {

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index 981a222f951..0c640fbb96e 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-   default
+   cmake-utils_src_prepare
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2017-04-08 Thread Ettore Di Giacinto

commit: 35f4748b69b983fb712b725868931db60f46aa42
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Sat Apr  8 08:50:05 2017 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Sat Apr  8 09:08:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f4748b

x11-misc/virtualgl: fix metadata indentation

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 x11-misc/virtualgl/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 2b8c393548e..332a759 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -14,9 +14,9 @@
Proxy Maintainers


-   An open source package that gives any Unix or Linux remote display 
software
-   the ability to run OpenGL applications with full 3D hardware 
acceleration.
-
+   An open source package that gives any Unix or Linux remote 
display software
+   the ability to run OpenGL applications with full 3D hardware 
acceleration.
+   

virtualgl

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2017-04-08 Thread Ettore Di Giacinto

commit: 760dbd6845da13d76b6597ed4361ac6f021d9f8a
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Sat Apr  8 08:46:59 2017 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Sat Apr  8 09:08:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760dbd68

x11-misc/virtualgl: Version bump to 2.5.2, fixes bug #597378

Workarounds upstream bug, which likely will not be fixed anytime soon

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=597378
Package-Manager: Portage-2.3.3, Repoman-2.3.2

 x11-misc/virtualgl/Manifest   |  1 +
 x11-misc/virtualgl/virtualgl-2.5.2.ebuild | 88 +++
 2 files changed, 89 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 41b71e78e42..152e876fa28 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
 DIST VirtualGL-2.4.1.tar.gz 1116018 SHA256 
2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e SHA512 
b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
 WHIRLPOOL 
2fec19e22eab70cde4a9e4a8a2c9a9628e3e20809e6322b14de53bca50a967f8a142dee147255cb3e9d4d6c802d984b5adbd5293b6bdd205405b92fe18386b95
 DIST VirtualGL-2.5.1.tar.gz 1165255 SHA256 
da342e0157257cd7b7c9c6705c7f2b9853f28f6bb6c51c90c710cc14257f3659 SHA512 
a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a54a21cddb80f1edc2f89abfe88a584321c46383d3654
 WHIRLPOOL 
90555331f109b2cf3a0737860b57abebd8a21bd114effbae56ae900f03b65029e950c8d51cfed482eaa2376da219c7034823afca7d4e516721dbb8a56d3bf065
+DIST VirtualGL-2.5.2.tar.gz 1172965 SHA256 
4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238 SHA512 
a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
 WHIRLPOOL 
33efef4b83def93908dfdd89aecb1a075b68258dc5f7909af2bcf6f1047c7dc83f5aa125366517a03abb21c97d64428a0d4f21064a686facc49f34ae486e59d7

diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
new file mode 100644
index 000..981a222f951
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="http://www.virtualgl.org/";
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   default
+}
+
+src_configure() {
+   # Completely breaks steam/wine for discrete graphics otherwise
+   # see https://github.com/VirtualGL/virtualgl/issues/16
+   append-ldflags "-Wl,--no-as-needed"
+
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exe

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2016-10-22 Thread Pacho Ramos

commit: f4642fd8d4097d7006291019ddbabeb73815a721
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 22 07:53:14 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 22 07:53:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4642fd8

x11-misc/virtualgl: Update metadata to point to new maintainer

Package-Manager: portage-2.3.1

 x11-misc/virtualgl/metadata.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 2c6925b..2b8c393 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -2,12 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   pa...@gentoo.org
-   Pacho Ramos
-   
-   
-   gen...@mva.name
-   Vadim A. Misbakh-Soloviov
+   np-hard...@gentoo.org
+   NP-Hardass


rei4...@gmail.com

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2016-10-16 Thread Pacho Ramos

commit: 5d33d644bf065c598bef71a2156513c61800baf8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 16 08:22:27 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 16 08:23:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d33d644

x11-misc/virtualgl: Version bump

Package-Manager: portage-2.3.1

 x11-misc/virtualgl/Manifest   |  1 +
 x11-misc/virtualgl/virtualgl-2.5.1.ebuild | 85 +++
 2 files changed, 86 insertions(+)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 15f427c..41b71e7 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1 +1,2 @@
 DIST VirtualGL-2.4.1.tar.gz 1116018 SHA256 
2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e SHA512 
b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
 WHIRLPOOL 
2fec19e22eab70cde4a9e4a8a2c9a9628e3e20809e6322b14de53bca50a967f8a142dee147255cb3e9d4d6c802d984b5adbd5293b6bdd205405b92fe18386b95
+DIST VirtualGL-2.5.1.tar.gz 1165255 SHA256 
da342e0157257cd7b7c9c6705c7f2b9853f28f6bb6c51c90c710cc14257f3659 SHA512 
a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a54a21cddb80f1edc2f89abfe88a584321c46383d3654
 WHIRLPOOL 
90555331f109b2cf3a0737860b57abebd8a21bd114effbae56ae900f03b65029e950c8d51cfed482eaa2376da219c7034823afca7d4e516721dbb8a56d3bf065

diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
new file mode 100644
index ..af1d5aa
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="http://www.virtualgl.org/";
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   default
+}
+
+src_configure() {
+   abi_configure() {
+   local mycmakeargs=(
+   -DVGL_USESSL="$(usex ssl)"
+   -DVGL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DVGL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2016-09-29 Thread Pacho Ramos

commit: 8559c1e2a2160dc99977e7d2e6c8b31838c3e852
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Sep 29 17:23:25 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Sep 29 17:44:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8559c1e2

x11-misc/virtualgl: Drop old

Package-Manager: portage-2.3.0

 x11-misc/virtualgl/Manifest  |  1 -
 x11-misc/virtualgl/files/vgl.confd-r1| 27 -
 x11-misc/virtualgl/files/vgl.initd-r2| 30 --
 x11-misc/virtualgl/virtualgl-2.3.3.ebuild| 83 ---
 x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild | 83 ---
 x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild | 86 
 x11-misc/virtualgl/virtualgl-2.4.1.ebuild| 83 ---
 7 files changed, 393 deletions(-)

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index bce7452..15f427c 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1 @@
-DIST VirtualGL-2.3.3.tar.gz 2614988 SHA256 
857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45 SHA512 
7bab5145be338d9bb2f9b4952ee530e84ae195185d55039cf10c89ced049716756f23f4d9c41c82f032c6e6a57bbbaebf023b3e501011bfd5c6aa3d59b22dd8d
 WHIRLPOOL 
e903172545c825b8df1dc6678738ac5e7ac2a104ec979668e522f46e2d2f715a3a07cb3cbac57c9e848a6420873f671737b7bed9acf50556a4aea08c4c1355a3
 DIST VirtualGL-2.4.1.tar.gz 1116018 SHA256 
2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e SHA512 
b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
 WHIRLPOOL 
2fec19e22eab70cde4a9e4a8a2c9a9628e3e20809e6322b14de53bca50a967f8a142dee147255cb3e9d4d6c802d984b5adbd5293b6bdd205405b92fe18386b95

diff --git a/x11-misc/virtualgl/files/vgl.confd-r1 
b/x11-misc/virtualgl/files/vgl.confd-r1
deleted file mode 100644
index d56414d..
--- a/x11-misc/virtualgl/files/vgl.confd-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/conf.d/vgl
-
-DISPLAY="${DISPLAY:-:0}"
-
-# Make it a function in case we have to repeat it in init script later
-set_xauth() {
-
-# common case (works in almost all tested environments (except of lightdm)):
-XAUTHORITY="$(ps wwax -C X,Xorg -o args= --sort=-stime | grep -m 1 -o 
'\B[-]auth\s*/var\S*auth\S*' | cut -d ' ' -f 2)"
-
-# kdm and some others:
-# XAUTHORITY="$(find /var/run/xauth/A${DISPLAY}-*|tail -n1)"
-
-# gdm:
-# XAUTHORITY="/var/gdm/${DISPLAY}.Xauth"
-
-# slim:
-# XAUTHORITY="/var/run/slim.auth"
-
-# lightdm:
-# XAUTHORITY="/var/run/lightdm/root/${DISPLAY}"
-
-# lxdm:
-# XAUTHORITY="/var/run/lxdm/lxdm-${DISPLAY}.auth"
-
-}
-set_xauth

diff --git a/x11-misc/virtualgl/files/vgl.initd-r2 
b/x11-misc/virtualgl/files/vgl.initd-r2
deleted file mode 100644
index 6b1e6d6..
--- a/x11-misc/virtualgl/files/vgl.initd-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: description="*" and other OpenRC 0.9+ candies
-
-depend() {
-   need xdm
-   after sshd
-}
-
-start() {
-   ebegin "Starting VirtualGL"
-   truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
-
-   # Check if XAUTHORITY was set successfully, if not wait a bit and let X 
to start
-   [ -z "$XAUTHORITY" ] && sleep 3 && set_xauth
-   [ -e "$XAUTHORITY" ] || sleep 3
-   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f 
$XAUTHORITY list | awk '{print $3;exit}'` && \
-   chmod 644 /var/lib/VirtualGL/vgl_xauth_key
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping VirtualGL"
-   [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
-   rm /var/lib/VirtualGL/vgl_xauth_key
-   eend $?
-}

diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
deleted file mode 100644
index b1780b7..
--- a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
-HOMEPAGE="http://www.virtualgl.org/";
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-RDEPEND="
-   ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libXv[${MULTILIB_USEDEP}]
-   virtual/glu[${MULTILIB_USEDEP}]
-   virtual/opengl[${MULTILIB_USEDEP}]
-   amd64? ( abi_x86_32? (
-   >=media-libs/libjpeg-turb

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2016-09-29 Thread Pacho Ramos

commit: 7263c2be2416c13731a5232508b9a4742654f334
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Sep 29 17:21:37 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Sep 29 17:44:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7263c2be

x11-misc/virtualgl: Update metadata with updated mail address (#595000#c4 by 
Toralf Förster).

Package-Manager: portage-2.3.0

 x11-misc/virtualgl/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 654187c..2c6925b 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -6,7 +6,7 @@
Pacho Ramos


-   m...@mva.name
+   gen...@mva.name
Vadim A. Misbakh-Soloviov

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2016-06-10 Thread Agostino Sarubbo

commit: 4a40f0ebfa12efcdcbfd7e1d93929e8b77b7ed48
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 10 15:32:30 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 10 15:32:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a40f0eb

x11-misc/virtualgl: amd64 stable wrt bug #585066

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
index a0454f6..06e7617 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl ssl"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2016-05-17 Thread Austin English

commit: 857a0adb6afcffb07946e062df60a93b63d003a2
Author: Austin English  gentoo  org>
AuthorDate: Wed May 18 06:35:32 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed May 18 06:38:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857a0adb

x11-misc/virtualgl: use #!/sbin/openrc-run instead of #!/sbin/runscript

 x11-misc/virtualgl/files/vgl.initd-r2 | 2 +-
 x11-misc/virtualgl/files/vgl.initd-r3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/virtualgl/files/vgl.initd-r2 
b/x11-misc/virtualgl/files/vgl.initd-r2
index 7d5981f..6b1e6d6 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r2
+++ b/x11-misc/virtualgl/files/vgl.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 
b/x11-misc/virtualgl/files/vgl.initd-r3
index 7901025..32ab7d1 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

2015-12-27 Thread Patrice Clement

commit: bd21e9ce615caa06002d6df6c97444e913e0244a
Author: Jason Schulz  schulz  name>
AuthorDate: Sat Dec 26 22:56:29 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 27 00:43:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd21e9ce

x11-misc/virtualgl: race condition fix

This fixes a race condition in the openrc script.

Gentoo-Bug: 569226
Suggested-By: Jason Schulz  schulz.name>

 x11-misc/virtualgl/files/vgl.initd-r3| 46 +++
 x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild | 86 
 2 files changed, 132 insertions(+)

diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 
b/x11-misc/virtualgl/files/vgl.initd-r3
new file mode 100644
index 000..970a29e
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+   need xdm
+   after sshd
+}
+
+start() {
+   ebegin "Starting VirtualGL"
+   truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+  set_xauth
+
+  if [ -z "$XAUTHORITY" ]; then
+
+einfo "Waiting for xauthority..."
+
+# wait for xauth file
+while true; do 
+  set_xauth
+
+  if [ -e "$XAUTHORITY" ]; then
+break;
+  fi
+
+  sleep 1
+done 
+  fi
+
+
+   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f 
$XAUTHORITY list | awk '{print $3;exit}'` && \
+   chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping VirtualGL"
+   [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+   rm /var/lib/VirtualGL/vgl_xauth_key
+   eend $?
+}

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
new file mode 100644
index 000..a0454f6
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="http://www.virtualgl.org/";
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   default
+}
+
+src_configure() {
+   abi_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use ssl VGL_USESSL)
+   -DVGL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DVGL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r3" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/

2015-12-27 Thread Patrice Clement

commit: fad420ef357962a3505f9aca55b32434ddc6719a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Dec 27 10:14:44 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 27 10:15:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad420ef

x11-misc/virtualgl: Backticks out, Subshell in.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 x11-misc/virtualgl/files/vgl.initd-r3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 
b/x11-misc/virtualgl/files/vgl.initd-r3
index 970a29e..7901025 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -33,7 +33,7 @@ start() {
   fi
 
 
-   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f 
$XAUTHORITY list | awk '{print $3;exit}'` && \
+   xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f 
$XAUTHORITY list | awk '{print $3;exit}') && \
chmod 644 /var/lib/VirtualGL/vgl_xauth_key
eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2015-12-04 Thread Anthony G. Basile

commit: a3c8ae763c0fec863eaf766fb217b88b84e28937
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Dec  4 09:49:59 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Dec  4 09:50:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c8ae76

x11-misc/virtualgl: add libressl support

Package-Manager: portage-2.2.20.1

 x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild | 86 
 1 file changed, 86 insertions(+)

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild
new file mode 100644
index 000..86cdb6f
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="http://www.virtualgl.org/";
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   default
+}
+
+src_configure() {
+   abi_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use ssl VGL_USESSL)
+   -DVGL_DOCDIR=/usr/share/doc/"${PF}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DVGL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r2" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/

2015-09-20 Thread Pacho Ramos

commit: fed12a1bc95a7a7d4409b47af7ce0f2b9f48b685
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Sep 20 08:23:03 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Sep 20 08:23:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed12a1b

x11-misc/virtualgl: Fix docdir path

Package-Manager: portage-2.2.20.1

 x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild
index 926a7d7..f271f99 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild
@@ -49,7 +49,7 @@ src_configure() {
abi_configure() {
local mycmakeargs=(
$(cmake-utils_use ssl VGL_USESSL)
-   -DVGL_DOCDIR=/usr/share/doc/"${P}"
+   -DVGL_DOCDIR=/usr/share/doc/"${PF}"
-DTJPEG_INCLUDE_DIR=/usr/include
-DVGL_LIBDIR=/usr/$(get_libdir)
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so

[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/

2015-09-19 Thread Pacho Ramos

commit: 945fef13fa4820de9ebafdf8c399d19f74418954
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 19 08:48:29 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 19 08:48:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945fef13

Fix handling of SDDM (#539340 by Rafal Lalik)

Package-Manager: portage-2.2.20.1

 x11-misc/virtualgl/files/vgl.confd-r2| 27 +
 x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild | 83 
 2 files changed, 110 insertions(+)

diff --git a/x11-misc/virtualgl/files/vgl.confd-r2 
b/x11-misc/virtualgl/files/vgl.confd-r2
new file mode 100644
index 000..a0cf7c5
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.confd-r2
@@ -0,0 +1,27 @@
+# /etc/conf.d/vgl
+
+DISPLAY="${DISPLAY:-:0}"
+
+# Make it a function in case we have to repeat it in init script later
+set_xauth() {
+
+# common case (works in almost all tested environments (except of lightdm)):
+XAUTHORITY="$(ps wwax -C X,Xorg -o args= --sort=-stime | grep -m 1 -o 
'\B[-]auth\s*/var\S*' | cut -d ' ' -f 2)"
+
+# kdm and some others:
+# XAUTHORITY="$(find /var/run/xauth/A${DISPLAY}-*|tail -n1)"
+
+# gdm:
+# XAUTHORITY="/var/gdm/${DISPLAY}.Xauth"
+
+# slim:
+# XAUTHORITY="/var/run/slim.auth"
+
+# lightdm:
+# XAUTHORITY="/var/run/lightdm/root/${DISPLAY}"
+
+# lxdm:
+# XAUTHORITY="/var/run/lxdm/lxdm-${DISPLAY}.auth"
+
+}
+set_xauth

diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild 
b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild
new file mode 100644
index 000..926a7d7
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware 
acceleration"
+HOMEPAGE="http://www.virtualgl.org/";
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+   ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXv[${MULTILIB_USEDEP}]
+   virtual/glu[${MULTILIB_USEDEP}]
+   virtual/opengl[${MULTILIB_USEDEP}]
+   amd64? ( abi_x86_32? (
+   >=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/libXv-1.0.10[abi_x86_32]
+   >=virtual/glu-9.0-r1[abi_x86_32]
+   >=virtual/opengl-7.0-r1[abi_x86_32]
+   ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   # Use /var/lib, bug #428122
+   sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html 
doc/advancedopengl.txt \
+   server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+   default
+}
+
+src_configure() {
+   abi_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use ssl VGL_USESSL)
+   -DVGL_DOCDIR=/usr/share/doc/"${P}"
+   -DTJPEG_INCLUDE_DIR=/usr/include
+   -DVGL_LIBDIR=/usr/$(get_libdir)
+   -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+   -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+   -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+   )
+   cmake-utils_src_configure
+   }
+   multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   # Make config dir
+   dodir /var/lib/VirtualGL
+   fowners root:video /var/lib/VirtualGL
+   fperms 0750 /var/lib/VirtualGL
+   newinitd "${FILESDIR}/vgl.initd-r2" vgl
+   newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+   exeinto /usr/libexec
+   doexe "${FILESDIR}/vgl-helper.sh"
+   systemd_dounit "${FILESDIR}/vgl.service"
+
+   # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+   mv "${D}"/usr/bin/{,v}glxinfo || die
+
+   # Remove license files, bug 536284
+   rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}

74 matches

Mail list logo