[arch-commits] Commit in lib32-freeglut/trunk (PKGBUILD glut.diff)

[Jan Steffens]

    Date: Wednesday, September 18, 2019 @ 22:20:51
  Author: heftig
Revision: 511120

3.2.0-1

Added:
  lib32-freeglut/trunk/glut.diff
Modified:
  lib32-freeglut/trunk/PKGBUILD

-----------+
 PKGBUILD  |   28 ++++++++++++++++------------
 glut.diff |   21 +++++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-18 22:01:51 UTC (rev 511119)
+++ PKGBUILD	2019-09-18 22:20:51 UTC (rev 511120)
@@ -5,8 +5,8 @@
 
 _pkgname=freeglut
 pkgname=lib32-${_pkgname}
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc='Provides functionality for small OpenGL programs (32-bit)'
 url='http://freeglut.sourceforge.net/'
 arch=('x86_64')
@@ -16,30 +16,34 @@
 replaces=('lib32-glut')
 provides=('lib32-glut')
 conflicts=('lib32-glut')
-source=(https://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz)
-sha512sums=('9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0')
+source=(https://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz
+        glut.diff)
+sha512sums=('78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818'
+            '6778538722707460a7c71eceee430f3945fcfcff351d0a05623417a183af4e8f85a497e24208b73756b2713bb5c11d39dbd4e6de7f06b8865fd81a1faa23b9a4')
 
 prepare() {
-  mkdir ${_pkgname}-${pkgver}/build
+  cd ${_pkgname}-${pkgver}
+  patch -Np1 -i ../glut.diff
 }
 
 build() {
-  cd ${_pkgname}-${pkgver}/build
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-  cmake .. \
+
+  cmake -H${_pkgname}-${pkgver} -Bbuild \
+    -DFREEGLUT_BUILD_STATIC_LIBS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib32 \
-    -DCMAKE_BUILD_TYPE=Release
-  make
+    -DCMAKE_BUILD_TYPE=None
+  cmake --build build
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" cmake --build build --target install
   rm -rf "${pkgdir}/usr/include"
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -sr "${pkgdir}"/usr/lib32/pkgconfig/{glut,freeglut}.pc
+  install -Dm 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ${_pkgname}-${pkgver}/COPYING
 }
 
 # vim: ts=2 sw=2 et:

Added: glut.diff
===================================================================
--- glut.diff	                        (rev 0)
+++ glut.diff	2019-09-18 22:20:51 UTC (rev 511120)
@@ -0,0 +1,21 @@
+diff -u -r freeglut-3.2.0/CMakeLists.txt freeglut-3.2.0-glut/CMakeLists.txt
+--- freeglut-3.2.0/CMakeLists.txt	2019-03-26 18:55:42.000000000 +0000
++++ freeglut-3.2.0-glut/CMakeLists.txt	2019-09-18 22:02:21.093590716 +0000
+@@ -73,7 +73,7 @@
+     include/GL/freeglut_std.h
+ )
+ IF(FREEGLUT_REPLACE_GLUT)
+-    LIST(APPEND FREEGLUT_SRCS
++    LIST(APPEND FREEGLUT_HEADERS
+         include/GL/glut.h
+     )
+ ENDIF()
+@@ -622,7 +622,7 @@
+     "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfig.cmake"
+     @ONLY
+ )
+-SET(ConfigPackageLocation lib/cmake/FreeGLUT)
++SET(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/FreeGLUT)
+ INSTALL(EXPORT FreeGLUTTargets
+     FILE FreeGLUTTargets.cmake
+     NAMESPACE FreeGLUT::