diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
| commit | b6cfc0c19effe2d9f7b8ab303cd00636f16da253 (patch) | |
| tree | a0158050dac0a7ebfb9df4f667ec6ad2dd185538 /dev-qt/qtbase/files | |
| parent | 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (diff) | |
gentoo auto-resync : 19:04:2024 - 12:05:02
Diffstat (limited to 'dev-qt/qtbase/files')
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch | 29 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch | 13 |
2 files changed, 0 insertions, 42 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch b/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch deleted file mode 100644 index f8263d10c022..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes build with libglvnd[-X]. - -https://github.com/qt/qtbase/commit/929d9a4ca5c9eb0a590479182471d0bbc81589aa -From: Yaroslav Isakov <yaroslav.isakov@gmail.com> -Date: Sat, 8 Jul 2023 22:09:40 +0200 -Subject: [PATCH] Allow OpenGL to be found on X11-less Linux systems (using - libOpenGL) - -Cmake supports finding OpenGL, even if there is no GLX (for glvnd) or -old-style libGL. This change keeps old behavior, but in case, if -X11-related OpenGL libraries cannot be found on Linux, it adds logic -to check for (and link with) libOpenGL, if it is present. ---- a/cmake/FindWrapOpenGL.cmake -+++ b/cmake/FindWrapOpenGL.cmake -@@ -47,4 +47,14 @@ - target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL) - endif() -+elseif(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Integrity") -+ # Requesting only the OpenGL component ensures CMake does not mark the package as -+ # not found if neither GLX nor libGL are available. This allows finding OpenGL -+ # on an X11-less Linux system. -+ find_package(OpenGL ${WrapOpenGL_FIND_VERSION} COMPONENTS OpenGL) -+ if (OpenGL_FOUND) -+ set(WrapOpenGL_FOUND ON) -+ add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED) -+ target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::OpenGL) -+ endif() - endif() - diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch deleted file mode 100644 index 1204dcc5c25c..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/925103 ---- a/src/corelib/thread/qthread.h -+++ b/src/corelib/thread/qthread.h -@@ -166,5 +166,9 @@ - #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) - // x86_64 Linux, BSD uses FS -+# if defined(__ILP32__) -+ __asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); -+# else - __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); -+# endif - #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN) - // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block |