[arch-commits] Commit in lib32-freeglut/repos/multilib-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, September 18, 2019 @ 22:21:50
  Author: heftig
Revision: 511121

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-freeglut/repos/multilib-x86_64/PKGBUILD
    (from rev 511120, lib32-freeglut/trunk/PKGBUILD)
  lib32-freeglut/repos/multilib-x86_64/glut.diff
    (from rev 511120, lib32-freeglut/trunk/glut.diff)
Deleted:
  lib32-freeglut/repos/multilib-x86_64/PKGBUILD

-----------+
 PKGBUILD  |   94 +++++++++++++++++++++++++++++++-----------------------------
 glut.diff |   21 +++++++++++++
 2 files changed, 70 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-18 22:20:51 UTC (rev 511120)
+++ PKGBUILD	2019-09-18 22:21:50 UTC (rev 511121)
@@ -1,45 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-_pkgname=freeglut
-pkgname=lib32-${_pkgname}
-pkgver=3.0.0
-pkgrel=2
-pkgdesc='Provides functionality for small OpenGL programs (32-bit)'
-url='http://freeglut.sourceforge.net/'
-arch=('x86_64')
-license=('MIT')
-depends=('lib32-libxi' 'lib32-libxrandr' 'lib32-libgl' 'freeglut')
-makedepends=('lib32-mesa' 'lib32-glu' 'lib32-libxxf86vm' 'cmake')
-replaces=('lib32-glut')
-provides=('lib32-glut')
-conflicts=('lib32-glut')
-source=(https://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz)
-sha512sums=('9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0')
-
-prepare() {
-  mkdir ${_pkgname}-${pkgver}/build
-}
-
-build() {
-  cd ${_pkgname}-${pkgver}/build
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib32 \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-  make -C build DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/include"
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-freeglut/repos/multilib-x86_64/PKGBUILD (from rev 511120, lib32-freeglut/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-18 22:21:50 UTC (rev 511121)
@@ -0,0 +1,49 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+_pkgname=freeglut
+pkgname=lib32-${_pkgname}
+pkgver=3.2.0
+pkgrel=1
+pkgdesc='Provides functionality for small OpenGL programs (32-bit)'
+url='http://freeglut.sourceforge.net/'
+arch=('x86_64')
+license=('MIT')
+depends=('lib32-libxi' 'lib32-libxrandr' 'lib32-libgl' 'freeglut')
+makedepends=('lib32-mesa' 'lib32-glu' 'lib32-libxxf86vm' 'cmake')
+replaces=('lib32-glut')
+provides=('lib32-glut')
+conflicts=('lib32-glut')
+source=(https://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz
+        glut.diff)
+sha512sums=('78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818'
+            '6778538722707460a7c71eceee430f3945fcfcff351d0a05623417a183af4e8f85a497e24208b73756b2713bb5c11d39dbd4e6de7f06b8865fd81a1faa23b9a4')
+
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  patch -Np1 -i ../glut.diff
+}
+
+build() {
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  cmake -H${_pkgname}-${pkgver} -Bbuild \
+    -DFREEGLUT_BUILD_STATIC_LIBS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib32 \
+    -DCMAKE_BUILD_TYPE=None
+  cmake --build build
+}
+
+package() {
+  DESTDIR="${pkgdir}" cmake --build build --target install
+  rm -rf "${pkgdir}/usr/include"
+  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:

Copied: lib32-freeglut/repos/multilib-x86_64/glut.diff (from rev 511120, lib32-freeglut/trunk/glut.diff)
===================================================================
--- glut.diff	                        (rev 0)
+++ glut.diff	2019-09-18 22:21:50 UTC (rev 511121)
@@ -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::