diff options
Diffstat (limited to 'x11-misc/virtualgl')
| -rw-r--r-- | x11-misc/virtualgl/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch | 140 | ||||
| -rw-r--r-- | x11-misc/virtualgl/virtualgl-3.0.1.ebuild | 5 |
3 files changed, 147 insertions, 1 deletions
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index 0d22977035d8..5ca4c021f2b0 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -2,8 +2,9 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9 +AUX virtualgl-3.0.1-libX11-1.8.patch 4857 BLAKE2B b37e84af828c4d7e37a9ec424aa92dc25330be9362f0c7bdc2624eac0898d5995be1647c690b2b7be9e656747785325aed961ea11ef5f653ea05ab44b4b3e4d7 SHA512 f17715b21f91439675981d2e6dad635cccbb36ddc012f037ff9d0859a21179f6881aac1ad7f5630e2311146bec7b10284bad982986b1e2f43beb3b24a0a8796b DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f SHA512 d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c SHA512 9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98 EBUILD virtualgl-3.0-r1.ebuild 2881 BLAKE2B 69136dc5f076bba86dd959469b2e34f907a3e0e06abf54fe405ecd5d6c00cba771cee919f32fc1e4deaef344c932116ea635630f96adaf27a60b72e1dc961b39 SHA512 529dad8bd5d70fa7d485cc96a199dfabed5da192aa43b116c47e4389e65f9c5c6b45ebcf7ed3a773960b5caaf8c98dc7eb58eb7fe598c7edffd508d1bf510688 -EBUILD virtualgl-3.0.1.ebuild 2883 BLAKE2B 0702f26b525231c9b2ddf32f9f3e5f5e4568d05b403f31f9dc39f34e5b297b58d9744050ef808660607f167430c2d3ef9e920cf0c2bb9fb50f430dfc4b39d75d SHA512 094555bbe345a3000bd1f36a130f6e905a1ac36fd5c438a8e653de1e0d9085022a0d531fc61513ee8801c85952bd0854bb420c3fed30ad3cbd484a318af31918 +EBUILD virtualgl-3.0.1.ebuild 3002 BLAKE2B aa4636501dd98f833e37e6e645bddaa79b97d0379dd3db3bfdde0f4d92e8f42c7bcb5d0f74086ce2499d03edefae474023de4813bb381de24c049a698249ca1f SHA512 b915c75c946ac1255376fbe909442e7e0c1e060b38ce7d5402b1b6cb022d855891371a2c6b4681341d53d7a4040e8b879177b3d172c3397f874fbe2a49ef033c MISC metadata.xml 932 BLAKE2B c4d1157475fd41d35cb89fed88e126cb8ff693c07eafb9c1619a557445f401e8b45c471b0c6c92c89ca870c91a55dac0ad519afddbc05960724888ae4ae79bef SHA512 5abf871ca4a4025e6f2da5657932baa38cd6748f36b578ac45b79071b962664bd76510759d3a51e7469cfa92296767b598d69183ced63c016d9b88b785460d2d 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 \ |