summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann Mayer2017-10-17 09:16:14 +0200
committerHermann Mayer2017-10-17 09:16:14 +0200
commit7bcd518924c095356013a3acb2e2f84b8323b050 (patch)
treeb594b51e7af02a6004a10b56dc26610d9b935e74
parent1ad2057662379075132ce58224dff380d9bcd142 (diff)
downloadaur-7bcd518924c095356013a3acb2e2f84b8323b050.tar.gz
Updated to 4.0.4.r7
Signed-off-by: Hermann Mayer <hermann.mayer92@gmail.com>
-rw-r--r--PKGBUILD11
-rw-r--r--fix-opencv-headers.patch29
2 files changed, 10 insertions, 30 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 31e37199671..e051c284d14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
# Maintainer: Arthur Zamarin <arthurzam@gmail.com>
+# Maintainer: Hermann Mayer <hermann.mayer92@gmail.com>
_pkgname=psmoveapi
pkgname=${_pkgname}-git
-pkgver=4.0.1.r14.g1eb4525
-pkgrel=2
+pkgver=4.0.4.r7.ge64a766
+pkgrel=1
pkgdesc="Playstation Move Motion Controller API"
arch=(i686 x86_64)
url="http://thp.io/2010/psmove/"
@@ -15,7 +16,7 @@ source=("${_pkgname}::git+https://github.com/thp/psmoveapi.git"
'fix-opencv-headers.patch'
'add-libv4l2-module.patch')
sha1sums=('SKIP'
- '4544da4ae2f0220350b9d59f05d1e6c8b5e71b36'
+ '383b842942af8f5911d23b4950fe4ef4addbaf67'
'f81b484bced325b076ea550b47f2bb145f709a45')
pkgver() {
@@ -50,7 +51,9 @@ build() {
package() {
cd "${srcdir}/${_pkgname}"
make DESTDIR="$pkgdir" install
+ install -m755 -d "${pkgdir}"/usr/lib/python3.6/site-packages/
+ install -D -m644 _psmove.so "${pkgdir}"/usr/lib/python3.6/site-packages/
+ install -D -m644 psmove.py "${pkgdir}"/usr/lib/python3.6/site-packages/
install -D -m644 psmove_config.h "${pkgdir}"/usr/include/psmoveapi/
install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
-
diff --git a/fix-opencv-headers.patch b/fix-opencv-headers.patch
index de84a68cdca..8b47a9bf7ea 100644
--- a/fix-opencv-headers.patch
+++ b/fix-opencv-headers.patch
@@ -2,35 +2,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e45cae..081c00a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -74,7 +74,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
- set(CMAKE_STATIC_LIBRARY_FLAGS "${CMAKE_STATIC_LIBRARY_FLAGS} -stdlib=libc++")
--
-+
- ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- list(APPEND PSMOVEAPI_REQUIRED_LIBS setupapi bthprops kernel32 ws2_32 winmm version imm32)
-
-@@ -101,8 +101,12 @@ ELSE()
+@@ -91,5 +91,9 @@ list(APPEND PSMOVEAPI_REQUIRED_LIBS m)
include_directories(${UDEV_INCLUDE_DIRS})
list(APPEND PSMOVEAPI_REQUIRED_LIBS ${UDEV_LIBRARIES})
-
+
+ pkg_check_modules(V4L2 REQUIRED libv4l2)
+ include_directories(${V4L2_INCLUDE_DIRS})
+ list(APPEND PSMOVEAPI_REQUIRED_LIBS ${V4L2_LIBRARIES})
+
- pkg_check_modules(BLUEZ REQUIRED bluez)
--
-+
- # auto-detect BlueZ version >= 5
- if(${BLUEZ_VERSION} VERSION_LESS "5.0")
- set(INFO_BLUEZ5_SUPPORT "No")
-@@ -147,7 +151,7 @@ file(GLOB PSMOVEAPI_HEADERS
-
- file (GLOB PSMOVEAPI_MATH_HEADERS
- "${CMAKE_CURRENT_LIST_DIR}/math/*.h"
-- "${CMAKE_CURRENT_LIST_DIR}/math/*.hpp"
-+ "${CMAKE_CURRENT_LIST_DIR}/math/*.hpp"
- )
-
- file (GLOB PSMOVEAPI_MATH_SRC
+ pkg_check_modules(BLUEZ REQUIRED bluez>=5)