[arch-commits] Commit in ois/trunk (PKGBUILD gcc47.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, March 21, 2018 @ 20:36:15
  Author: svenstaro
Revision: 310251

upgpkg: ois 1.4-1

Modified:
  ois/trunk/PKGBUILD
Deleted:
  ois/trunk/gcc47.patch

-------------+
 PKGBUILD    |   26 ++++++++++----------------
 gcc47.patch |   56 --------------------------------------------------------
 2 files changed, 10 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-21 19:57:52 UTC (rev 310250)
+++ PKGBUILD	2018-03-21 20:36:15 UTC (rev 310251)
@@ -2,34 +2,28 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: scippio <scippio at berounet.cz>
 pkgname=ois
-pkgver=1.3
-_oisver=${pkgver/./-}
-pkgrel=4
+pkgver=1.4
+pkgrel=1
 pkgdesc="Object Oriented Input System"
 arch=('x86_64')
 url="http://sourceforge.net/projects/wgois"
 license=('custom:zlib')
-makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'libxaw')
-source=("https://downloads.sourceforge.net/project/wgois/Source%20Release/${pkgver}/ois_v${_oisver}.tar.gz"
-        "gcc47.patch")
-md5sums=('9697fead17eac6025151cd2e1fca1518'
-         '5c9d151b7068cb0c25e584d7753831ff')
+makedepends=('cmake' 'gcc' 'libxaw')
+source=("https://github.com/ogre3d/OIS/archive/3b4c2d6ceaa14f38a371b92de61d2603d2522b71.zip")
+sha512sums=('b1c69f3f2a5be22adc88a886f97dc27501e80b96de377ca588662fc03206deb6f885895f618db6e99541cbb97a564afeb84c5ee97709873eaf060c0062d1240b')
 
 build() {
-  cd ${srcdir}/${pkgname}-v${_oisver}
+  cd OIS-*/
 
-  patch -Np1 < ${srcdir}/gcc47.patch
-
-  chmod +x bootstrap
-  ./bootstrap
-  ./configure --prefix=/usr
+  mkdir -p build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-v${_oisver}
+  cd OIS-*/build
 
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ReadMe.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 ../LICENSE.md ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }

Deleted: gcc47.patch
===================================================================
--- gcc47.patch	2018-03-21 19:57:52 UTC (rev 310250)
+++ gcc47.patch	2018-03-21 20:36:15 UTC (rev 310251)
@@ -1,56 +0,0 @@
-diff -rup ois-v1-3/configure.ac patched/configure.ac
---- ois-v1-3/configure.ac	2010-04-04 13:51:08.000000000 -0400
-+++ patched/configure.ac	2013-01-30 20:33:38.461394645 -0500
-@@ -5,7 +5,7 @@ AC_INIT( [OIS], 1.3.0 )
- 
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE( [OIS], 1.3.0 )
--AM_CONFIG_HEADER([includes/config.h])
-+AC_CONFIG_HEADERS([includes/config.h])
- 
- dnl Check for programs
- AC_PROG_CC
-diff -rup ois-v1-3/demos/FFConsoleDemo.cpp patched/demos/FFConsoleDemo.cpp
---- ois-v1-3/demos/FFConsoleDemo.cpp	2010-03-31 23:38:04.000000000 -0400
-+++ patched/demos/FFConsoleDemo.cpp	2013-01-30 20:33:18.281393097 -0500
-@@ -7,6 +7,7 @@
- #include <ios>
- #include <sstream>
- #include <vector>
-+#include <unistd.h>
- 
- using namespace std;
- 
-diff -rup ois-v1-3/demos/OISConsole.cpp patched/demos/OISConsole.cpp
---- ois-v1-3/demos/OISConsole.cpp	2010-08-15 18:51:34.000000000 -0400
-+++ patched/demos/OISConsole.cpp	2013-01-30 20:33:18.281393097 -0500
-@@ -12,6 +12,7 @@
- #include <iostream>
- #include <vector>
- #include <sstream>
-+#include <unistd.h>
- 
- ////////////////////////////////////Needed Windows Headers////////////
- #if defined OIS_WIN32_PLATFORM
-diff -rup ois-v1-3/src/linux/LinuxForceFeedback.cpp patched/src/linux/LinuxForceFeedback.cpp
---- ois-v1-3/src/linux/LinuxForceFeedback.cpp	2010-03-31 23:06:55.000000000 -0400
-+++ patched/src/linux/LinuxForceFeedback.cpp	2013-01-30 20:33:18.284726761 -0500
-@@ -26,6 +26,7 @@ restrictions:
- #include <cstdlib>
- #include <errno.h>
- #include <memory.h>
-+#include <unistd.h>
- 
- using namespace OIS;
- 
-diff -rup ois-v1-3/src/linux/LinuxJoyStickEvents.cpp patched/src/linux/LinuxJoyStickEvents.cpp
---- ois-v1-3/src/linux/LinuxJoyStickEvents.cpp	2010-07-25 21:28:41.000000000 -0400
-+++ patched/src/linux/LinuxJoyStickEvents.cpp	2013-01-30 20:33:18.284726761 -0500
-@@ -33,6 +33,7 @@ restrictions:
- #include <fcntl.h>        //Needed to Open a file descriptor
- #include <cassert>	
- #include <linux/input.h>
-+#include <unistd.h>
- 
- 
- #include <sstream>