diff --git a/srcpkgs/ois/patches/fix_unistd_h.patch b/srcpkgs/ois/patches/fix_unistd_h.patch deleted file mode 100644 index 60e81b4b1b5..00000000000 --- a/srcpkgs/ois/patches/fix_unistd_h.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- src/linux/LinuxForceFeedback.cpp 2010-04-01 05:06:55.000000000 +0200 -+++ src/linux/LinuxForceFeedback.cpp 2015-08-03 13:47:54.690123238 +0200 -@@ -24,6 +24,7 @@ - #include "OISException.h" - - #include -+#include - #include - #include - ---- src/linux/LinuxJoyStickEvents.cpp 2010-07-26 03:28:41.000000000 +0200 -+++ src/linux/LinuxJoyStickEvents.cpp 2015-08-03 13:48:14.720124682 +0200 -@@ -30,6 +30,7 @@ - #include "OISEvents.h" - #include "OISException.h" - -+#include - #include //Needed to Open a file descriptor - #include - #include ---- demos/OISConsole.cpp 2010-08-16 00:51:34.000000000 +0200 -+++ demos/OISConsole.cpp 2015-08-03 13:52:09.446141604 +0200 -@@ -9,6 +9,7 @@ - //Advanced Usage - #include "OISForceFeedback.h" - -+#include - #include - #include - #include ---- demos/FFConsoleDemo.cpp 2010-04-01 05:38:04.000000000 +0200 -+++ demos/FFConsoleDemo.cpp 2015-08-03 13:53:47.366148664 +0200 -@@ -1,6 +1,7 @@ - #include "OIS.h" - - #include -+#include - #include - #include - #include diff --git a/srcpkgs/ois/template b/srcpkgs/ois/template index 90192536e02..27e59464fb2 100644 --- a/srcpkgs/ois/template +++ b/srcpkgs/ois/template @@ -1,23 +1,20 @@ # Template file for 'ois' pkgname=ois -version=1.4 +version=1.5 revision=1 wrksrc="OIS-${version}" -build_style=gnu-configure -hostmakedepends="automake libtool pkg-config" +build_style=cmake +hostmakedepends="pkg-config" makedepends="libXaw-devel" short_desc="Object oriented input system" maintainer="Jürgen Buchmüller " -license="Zlib" +license="zlib-acknowledgement" homepage="https://wgois.github.io/OIS/" distfiles="https://github.com/wgois/OIS/archive/v${version}.tar.gz" -checksum=aaa9289a0cc0bffbb03e894b1d10e65eac14572a2282d539afe48aec1ae35c75 +checksum=aa3e6b840b1149bb06835e04365957f4659c08b3e3095a48b289050f1637a174 -pre_configure() { - . bootstrap -} post_install() { - vlicense README.md + vlicense LICENSE.md } ois-devel_package() { @@ -26,7 +23,8 @@ ois-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/libOIS.a vmove usr/lib/libOIS.so + # Compatibility with previous versions + ln -srv ${PKGDESTDIR}/usr/include/{ois,OIS} } }