* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/
@ 2015-09-19 8:48 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2015-09-19 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 945fef13fa4820de9ebafdf8c399d19f74418954
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 08:48:29 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:48:29 2015 +0000
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 0000000..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 0000000..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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/
@ 2022-07-20 13:13 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2022-07-20 13:13 UTC (permalink / raw
To: gentoo-commits
commit: d2381a8ec1ffefc82269d3959a643940ba7aff84
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 13:11:30 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 13:11:30 2022 +0000
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 <pacho <AT> 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 000000000000..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 <information@virtualgl.org>
+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 <X11/Xlibint.h>
+ #include "FakePbuffer.h"
+ #include "TempContextEGL.h"
+ #include "BufferState.h"
+ #include "ContextHashEGL.h"
+-#include <X11/Xlibint.h>
+
+ 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 *reason_rtrn)
++#endif
+ {
+ Display *dpy = NULL;
+
+diff --git a/server/faker.cpp b/server/faker.cpp
+index ec537a62..601cfa3e 100644
+--- a/server/faker.cpp
++++ b/server/faker.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander
++// Copyright (C)2009, 2011, 2013-2016, 2019-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)
+@@ -14,6 +14,7 @@
+
+ #include <unistd.h>
+ #include "Mutex.h"
++#include <X11/Xlibint.h>
+ #include "ContextHash.h"
+ #ifdef EGLBACKEND
+ #include "ContextHashEGL.h"
+@@ -27,7 +28,6 @@
+ #include "fakerconfig.h"
+ #include "threadlocal.h"
+ #include <dlfcn.h>
+-#include <X11/Xlibint.h>
+ #include "faker.h"
+
+
diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index bdd5c8a49e50..c29aac4b170f 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -51,6 +51,11 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ # https://github.com/VirtualGL/virtualgl/issues/205 (from 'master')
+ "${FILESDIR}"/${P}-libX11-1.8.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 \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/
@ 2024-12-20 11:21 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2024-12-20 11:21 UTC (permalink / raw
To: gentoo-commits
commit: c519c61552b0aa0fe07f5ebda9029acbf49b7f23
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 11:14:31 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 11:21:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c519c615
x11-misc/virtualgl: drop 3.0.2, 3.1-r1
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/virtualgl/Manifest | 2 -
.../files/virtualgl-3.1-drop-register.patch | 53 -----------
x11-misc/virtualgl/virtualgl-3.0.2.ebuild | 101 ---------------------
x11-misc/virtualgl/virtualgl-3.1-r1.ebuild | 101 ---------------------
4 files changed, 257 deletions(-)
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 25a729659213..4851d867029c 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,4 +1,2 @@
-DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
DIST VirtualGL-3.1.1.tar.gz 1223341 BLAKE2B d82a3b8afddc165d4a99b281593662c7584b2d0060e1332bbb1dd621dc1098d4eb1e9c7b3d9a989fa08e89dfafe0001bff905c90aaefb0e0b7532e233a21e0e4 SHA512 40007910dce4ba1aa6bb00fc1e57af8e9d6a77a5a6c795d8f13c9883abc44787871a0bede8621de2fb042585f471281ba9e8bbd16d81c4049ddca8539f535e7e
DIST VirtualGL-3.1.2.tar.gz 1224655 BLAKE2B 92a971eed54d5b184eeee2302fee90ae86443291c5b246152f522d8ab92db86d3c6be258b4ce5a2e8fa05b639f9b9b91f6fd0920213103510b3a821a6629d7d7 SHA512 5f51691d66645cfca74997b36c442daf4d3fd54ab93b48e501a275a0e8fcc4ecaa71e24665619d40c5561c9598a8d3c224fb3b7ecd3afb56fe0a6ecc350aec5e
-DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b
diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
deleted file mode 100644
index 5e7153c3c383..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/VirtualGL/virtualgl/pull/233
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-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 <brahmajit.xyz@gmail.com>
---- 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.0.2.ebuild b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
deleted file mode 100644
index 27cb5efb4750..000000000000
--- a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; 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="https://downloads.sourceforge.net/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
- # 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
-}
diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
deleted file mode 100644
index 5e5505059f3f..000000000000
--- a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; 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="https://downloads.sourceforge.net/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 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/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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-20 11:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-20 11:21 [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2022-07-20 13:13 Pacho Ramos
2015-09-19 8:48 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox