diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-11-26 09:09:02 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-11-29 04:55:39 -0600 |
| commit | a33c1f93a2c22e47ded20a96979911eea4a8d743 (patch) | |
| tree | 03c00b4318109e9fd385aaadb6cab3d0291b1314 /user/freeglut | |
| parent | 271f2f0368391d1a99f1e408548a8d32e6cad748 (diff) | |
| download | packages-a33c1f93a2c22e47ded20a96979911eea4a8d743.tar.gz packages-a33c1f93a2c22e47ded20a96979911eea4a8d743.tar.bz2 packages-a33c1f93a2c22e47ded20a96979911eea4a8d743.tar.xz packages-a33c1f93a2c22e47ded20a96979911eea4a8d743.zip | |
user/freeglut: Use GLVND for OpenGL
Includes a patch to the CMake to use libOpenGL and libGLX instead of
the legacy libGL. We also explicitly set GLVND instead of LEGACY for
the FindOpenGL module.
Diffstat (limited to 'user/freeglut')
| -rw-r--r-- | user/freeglut/APKBUILD | 13 | ||||
| -rw-r--r-- | user/freeglut/glvnd.patch | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index fa130b8d1..084885517 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -2,16 +2,19 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=freeglut pkgver=3.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="https://freeglut.sourceforge.net/" arch="all" options="!check" # No test suite. license="X11" -depends_dev="mesa-dev libx11-dev libice-dev libxxf86vm-dev libxi-dev glu-dev" +depends_dev="glu-dev libglvnd-dev libice-dev libx11-dev libxi-dev + libxxf86vm-dev" makedepends="$depends_dev cmake" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + glvnd.patch + " build() { cmake . \ @@ -19,6 +22,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DFREEGLUT_BUILD_STATIC_LIBS=0 \ + -DOpenGL_GL_PREFERENCE=GLVND \ . make } @@ -27,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9 freeglut-3.2.2.tar.gz" +sha512sums="190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9 freeglut-3.2.2.tar.gz +ae99d5d749b0ed8a7c822651060cdf0d0d1d33610a16ddd6bd16dcf84c67ad475be6dd1278edf1ab4fdfbcb784217f0d05eab4503f1de63a3d6979edff12e8b9 glvnd.patch" diff --git a/user/freeglut/glvnd.patch b/user/freeglut/glvnd.patch new file mode 100644 index 000000000..123e943b7 --- /dev/null +++ b/user/freeglut/glvnd.patch @@ -0,0 +1,13 @@ +This allows us to link to the new GLVND libraries. Otherwise, there will be linker errors. + +--- freeglut-3.2.2/CMakeLists.txt.old 2022-02-06 10:50:52.000000000 +0000 ++++ freeglut-3.2.2/CMakeLists.txt 2024-11-26 12:50:25.436599428 +0000 +@@ -264,7 +264,7 @@ + LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) + ELSE() + FIND_PACKAGE(OpenGL REQUIRED) +- LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) ++ LIST(APPEND LIBS ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY}) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + ENDIF() + |