wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-10 23:02:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wxWidgets-gtk3: update to 3.2.8.1.

Browse source
This commit is contained in:
Helmut Pozimski 2025-07-06 09:29:56 +02:00
parent 1d5ac1f6e5
commit 86eade0755
2 changed files with 3 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
srcpkgs/wxWidgets-gtk3/patches/no-glvnd.patch
View file

@ -1,45 +0,0 @@
https://git.alpinelinux.org/aports/plain/community/wxwidgets/no-glvnd.patch
find_package(OpenGL) only works with glvnd and hardcodes glvnd paths, even
though all these components are easily found with pkgconfig..
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index ef28c99..b4df830 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -408,17 +408,26 @@ if(wxUSE_GUI)
set(OPENGL_FOUND TRUE)
set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore" "-framework GLKit")
else()
- find_package(OpenGL)
- if(OPENGL_FOUND)
- foreach(gltarget OpenGL::GL OpenGL::GLU OpenGL::OpenGL)
- if(TARGET ${gltarget})
- set(OPENGL_LIBRARIES ${gltarget} ${OPENGL_LIBRARIES})
- endif()
- endforeach()
- endif()
- if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
+ # find_package(OpenGL)
+ # if(OPENGL_FOUND)
+ # foreach(gltarget OpenGL::GL OpenGL::GLU OpenGL::OpenGL)
+ # if(TARGET ${gltarget})
+ # set(OPENGL_LIBRARIES ${gltarget} ${OPENGL_LIBRARIES})
+ # endif()
+ # endforeach()
+ # endif()
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(GLU REQUIRED glu IMPORTED_TARGET GLOBAL)
+ add_library(OpenGL::GLU ALIAS PkgConfig::GLU)
+ pkg_check_modules(GL REQUIRED gl IMPORTED_TARGET GLOBAL)
+ add_library(OpenGL::GL ALIAS PkgConfig::GL)
+ pkg_check_modules(EGL REQUIRED egl IMPORTED_TARGET GLOBAL)
+ add_library(OpenGL::EGL ALIAS PkgConfig::EGL)
+ set(OPENGL_FOUND TRUE)
+ set(OpenGL_EGL_FOUND TRUE)
+ if(WXGTK3 AND wxUSE_GLCANVAS_EGL)
if(TARGET OpenGL::EGL)
- set(OPENGL_LIBRARIES OpenGL::EGL ${OPENGL_LIBRARIES})
+ set(OPENGL_LIBRARIES OpenGL::EGL ${OPENGL_LIBRARIES} GL)
endif()
set(OPENGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR} ${OPENGL_EGL_INCLUDE_DIRS})
find_package(WAYLANDEGL)

6
srcpkgs/wxWidgets-gtk3/template
View file

@ -1,7 +1,7 @@
# Template file for 'wxWidgets-gtk3' # Template file for 'wxWidgets-gtk3'
pkgname=wxWidgets-gtk3 pkgname=wxWidgets-gtk3
version=3.2.5 version=3.2.8.1
revision=2 revision=1
build_style=cmake build_style=cmake
cmake_builddir="build-gtk3" cmake_builddir="build-gtk3"
configure_args="-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_OPENGL=ON -DwxUSE_LIBMSPACK=ON configure_args="-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_OPENGL=ON -DwxUSE_LIBMSPACK=ON
@ -19,7 +19,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="custom:wxWindows" license="custom:wxWindows"
homepage="https://www.wxwidgets.org" homepage="https://www.wxwidgets.org"
distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
checksum=0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51 checksum=ad0cf6c18815dcf1a6a89ad3c3d21a306cd7b5d99a602f77372ef1d92cb7d756
CXXFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" CXXFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"