Fix firmware installation.

1 files changed, 25 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e78ce319a3a8..8dd3caaafe80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=ueyed
 pkgdesc="IDS uEye camera daemon (USB and ethernet)"
 pkgver=4.92.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 license=(custom)
 url='https://en.ids-imaging.com'
 depends=('glibc' 'qt4')
-makedepends=('patchelf' 'sed')
+makedepends=('patchelf')
 install="$pkgname.install"
 backup=(
 	'etc/ueye/ueyeethd.conf'
@@ -22,6 +22,9 @@ source=(
 	"ueyeusb.rules"
 	"ueyeethd.conf"
 	"ueyeusbd.conf"
+	"ueyed-sysusers.conf"
+	"ueye-config.cmake"
+	"ueye-config-version.cmake"
 )
 
 sha512sums=('3dcb73451ebb96273ce422c5a68818bacf18012f063c69f8fd0b7381c3c6d3d9fd0443af415f973c63986a4b03099a313117f2a219f89f1c7f541171af9c489e'
@@ -29,13 +32,17 @@ sha512sums=('3dcb73451ebb96273ce422c5a68818bacf18012f063c69f8fd0b7381c3c6d3d9fd0
             '3e5d357f43e68a143b9da9c712043224304e30699618da9d17f0916297c48d4865d7af2a040561f1b13c6bdef7c613bc441549f152ce0669f67001f0d401fb5a'
             'fe1901eb22210e7c3f23171197e9316c2a400d68e62d32b52c3900d1d30c38654c90cf101db483dc140103a1c36c2de28b28e6d8a135564c382b0d3e70d37549'
             'c366ec985d541155f66e7ee0d97e0410b42d54136d8848398768a2b375b93dfe0d30bc1d8249ebbdab82a40db0aa26714b11c220fdbbfc69655e0d303df430f0'
-            'c14076c66ab907a8f0d271401b322298522460f405749b27179718479f3596eecc8704411a5f41ee7394d1598c4e58acc3cd3fef38646a2156878bdd18f934d4')
+            'a65feca40b879b3f9b84bf1a58c0dfd8a891444e39caf48c77a7565efbb4426a57b37e202f4ccf19f724711b96674bf98bb0797317bfc2b008b9f4898d53cb78'
+            '05b961501a56b1827986aabc2a5ea8320b711fb0089615b212711814906c52af51205f04ffd9df436510362b185911797176bb6ed71bec4e35db8b1cd4d1f408'
+            '74b18f11d7946d2cc90097dc537b03fda77a5aece9ec999bc48ac6648f7948eba4039c12518bf8f5b1bcb6d7822152374f6f80bf631362104743842a77ba3a65'
+            'd78245b67ca84602dde68db253ce211cce768a7b7e5e175cb3e373e7d831aeaaec243894bd1e170046efa6dc3dc4ca6145742fed324681a5ae1cd65cc0488f8e')
 
 prepare() {
 	cd "$srcdir"
 
-	# Comment out the the lines that run ueyesetup in the installer.
 	tail +149 "ueye_4.92.0.0_amd64.run" | tar -xz
+
+	rm "$srcdir/usr/bin/ueyesetup"
 }
 
 __install_dir() {
@@ -54,10 +61,10 @@ __install_dir() {
 package() {
 	cd "$srcdir"
 
-	__install_dir     "$srcdir/usr/share"        "$pkgdir/usr/share"             644
-	__install_dir     "$srcdir/usr/include"      "$pkgdir/usr/include"           644
-	__install_dir     "$srcdir/usr/lib"          "$pkgdir/usr/lib"               644
-	__install_dir     "$srcdir/lib/firmware/ids" "$pkgdir/usr/lib/firmware/ids"  644
+	__install_dir     "$srcdir/usr/share"        "$pkgdir/usr/share"               644
+	__install_dir     "$srcdir/usr/include"      "$pkgdir/usr/include"             644
+	__install_dir     "$srcdir/usr/lib"          "$pkgdir/usr/lib"                 644
+	__install_dir     "$srcdir/lib/firmware/ids" "$pkgdir/usr/lib/ueyed/firmware"  644
 
 	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/idscameramanager"
 	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyedemo"
@@ -72,11 +79,16 @@ package() {
 	# It does not do what we want for Arch Linux.
 	# Running it as root may actually damage your system.
 
-	install -D -m 644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/ueyeethd.service"
-	install -D -m 644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/ueyeusbd.service"
-	install -D -m 644 -t "$pkgdir/usr/lib/udev/rules.d"   "$srcdir/ueyeusb.rules"
-	install -D -m 644 -t "$pkgdir/etc/ueye"               "$srcdir/ueyeethd.conf"
-	install -D -m 644 -t "$pkgdir/etc/ueye"               "$srcdir/ueyeusbd.conf"
+	install -D -m 644 -t "$pkgdir/usr/lib/systemd/system"           "$srcdir/ueyeethd.service"
+	install -D -m 644 -t "$pkgdir/usr/lib/systemd/system"           "$srcdir/ueyeusbd.service"
+	install -D -m 644 -t "$pkgdir/usr/lib/udev/rules.d"             "$srcdir/ueyeusb.rules"
+	install -D -m 644 -t "$pkgdir/etc/ueye"                         "$srcdir/ueyeethd.conf"
+	install -D -m 644 -t "$pkgdir/etc/ueye"                         "$srcdir/ueyeusbd.conf"
+	install -D -m 644 -t "$pkgdir/etc/NetworkManager/dispatcher.d"  "$srcdir//etc/NetworkManager/dispatcher.d/ueyeethdnotify"
+
+	install -m 644 -D "$srcdir/ueye-config.cmake"         "$pkgdir/usr/lib/cmake/ueye/ueye-config.cmake"
+	install -m 644 -D "$srcdir/ueye-config-version.cmake" "$pkgdir/usr/lib/cmake/ueye/ueye-config-version.cmake"
+	install -m 644 -D "$srcdir/ueyed-sysusers.conf"       "$pkgdir/usr/lib/sysusers.d/ueyed.conf"
 
 	patchelf --remove-rpath "$pkgdir/usr/bin/idscameramanager"
 	patchelf --remove-rpath "$pkgdir/usr/bin/ueyedemo"