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

[Jan Steffens]

    Date: Monday, September 30, 2019 @ 17:24:30
  Author: heftig
Revision: 512201

archrelease: copy trunk to multilib-x86_64

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-30 17:24:29 UTC (rev 512200)
+++ PKGBUILD	2019-09-30 17:24:30 UTC (rev 512201)
@@ -1,49 +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.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/PKGBUILD (from rev 512199, lib32-freeglut/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-30 17:24:30 UTC (rev 512201)
@@ -0,0 +1,46 @@
+# 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.1
+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)
+sha512sums=('aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08')
+
+prepare() {
+  cd ${_pkgname}-${pkgver}
+}
+
+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:

Deleted: glut.diff
===================================================================
--- glut.diff	2019-09-30 17:24:29 UTC (rev 512200)
+++ glut.diff	2019-09-30 17:24:30 UTC (rev 512201)
@@ -1,21 +0,0 @@
-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::