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

[Jan Steffens via arch-commits]

Date: Monday, September 30, 2019 @ 17:23:40
  Author: heftig
Revision: 363572

3.2.1-1

Modified:
  freeglut/trunk/PKGBUILD
Deleted:
  freeglut/trunk/glut.diff

---+
 PKGBUILD  |9 +++--
 glut.diff |   21 -
 2 files changed, 3 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-30 17:23:01 UTC (rev 363571)
+++ PKGBUILD2019-09-30 17:23:40 UTC (rev 363572)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom 
 
 pkgname=freeglut
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=(x86_64)
@@ -14,14 +14,11 @@
 replaces=(glut)
 provides=(glut)
 conflicts=(glut)
-source=(https://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz
-glut.diff)
-sha512sums=('78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818'
-
'6778538722707460a7c71eceee430f3945fcfcff351d0a05623417a183af4e8f85a497e24208b73756b2713bb5c11d39dbd4e6de7f06b8865fd81a1faa23b9a4')
+source=(https://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../glut.diff
 }
 
 build() {

Deleted: glut.diff
===
--- glut.diff   2019-09-30 17:23:01 UTC (rev 363571)
+++ glut.diff   2019-09-30 17:23:40 UTC (rev 363572)
@@ -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.0 +
-+++ freeglut-3.2.0-glut/CMakeLists.txt 2019-09-18 22:02:21.093590716 +
-@@ -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::

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

[Jan Steffens via arch-commits]

Date: Wednesday, September 18, 2019 @ 22:20:40
  Author: heftig
Revision: 363015

3.2.0-1

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

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

Modified: PKGBUILD
===
--- PKGBUILD2019-09-18 21:51:09 UTC (rev 363014)
+++ PKGBUILD2019-09-18 22:20:40 UTC (rev 363015)
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom 
 
 pkgname=freeglut
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=(x86_64)
 url="http://freeglut.sourceforge.net/;
@@ -14,22 +14,29 @@
 replaces=(glut)
 provides=(glut)
 conflicts=(glut)
-source=(https://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
-md5sums=('90c3ca4dd9d51cf32276bc5344ec9754')
-sha1sums=('fca52242f9344627a30f11487ee42002e6b0dacd')
+source=(https://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz
+glut.diff)
+sha512sums=('78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818'
+
'6778538722707460a7c71eceee430f3945fcfcff351d0a05623417a183af4e8f85a497e24208b73756b2713bb5c11d39dbd4e6de7f06b8865fd81a1faa23b9a4')
 
 prepare() {
-  mkdir build
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../glut.diff
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=/usr 
-DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release
-  make
+  cmake -H$pkgname-$pkgver -Bbuild \
+-DFREEGLUT_BUILD_STATIC_LIBS=OFF \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DCMAKE_BUILD_TYPE=None
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../$pkgname-$pkgver/COPYING 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  DESTDIR="$pkgdir" cmake --build build --target install
+  ln -sr "$pkgdir"/usr/lib/pkgconfig/{glut,freeglut}.pc
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 
$pkgname-$pkgver/COPYING
 }
+
+# vim: ts=2 sw=2 et:

Added: glut.diff
===
--- glut.diff   (rev 0)
+++ glut.diff   2019-09-18 22:20:40 UTC (rev 363015)
@@ -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.0 +
 freeglut-3.2.0-glut/CMakeLists.txt 2019-09-18 22:02:21.093590716 +
+@@ -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::