Fix cmake files and installed library symlinks.

4 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aec6ec8e8d34..5c1bd2ac8d6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ueyed
 	pkgdesc = IDS uEye camera daemon (USB and ethernet)
 	pkgver = 4.92.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://en.ids-imaging.com
 	install = ueyed.install
 	arch = x86_64
@@ -27,8 +27,8 @@ pkgbase = ueyed
 	sha512sums = 8069b0b2c07d7ad3d283bea903f38676db8b6402b5a2830335ef14586cb5c1176bca4eeba94aadb534c02a3383c85feec7a048de818edac575543d6fb9ca193e
 	sha512sums = a65feca40b879b3f9b84bf1a58c0dfd8a891444e39caf48c77a7565efbb4426a57b37e202f4ccf19f724711b96674bf98bb0797317bfc2b008b9f4898d53cb78
 	sha512sums = 05b961501a56b1827986aabc2a5ea8320b711fb0089615b212711814906c52af51205f04ffd9df436510362b185911797176bb6ed71bec4e35db8b1cd4d1f408
-	sha512sums = 74b18f11d7946d2cc90097dc537b03fda77a5aece9ec999bc48ac6648f7948eba4039c12518bf8f5b1bcb6d7822152374f6f80bf631362104743842a77ba3a65
-	sha512sums = d78245b67ca84602dde68db253ce211cce768a7b7e5e175cb3e373e7d831aeaaec243894bd1e170046efa6dc3dc4ca6145742fed324681a5ae1cd65cc0488f8e
+	sha512sums = 701e2b52ddcbac80a2c59c5e6bddeb636a5197002118a7db4eae868290f91bdb0eaec1e4825914661fd5758f0bf1e80205d6ac6b1c148ee99707cc15ac5ce29b
+	sha512sums = 6ee23ba61c82b672fa1ad5eba4c1c2218516be9fdb68a7a2f4bd583197b010d28cd78bc8589a732c5f5c83e355e45689d1d43568c3c96dc857d062c9360ef5ec
 
 pkgname = ueyed
 
diff --git a/PKGBUILD b/PKGBUILD
index a95a7350a8fa..fad1ba815628 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=ueyed
 pkgdesc="IDS uEye camera daemon (USB and ethernet)"
 pkgver=4.92.0
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 license=(custom)
 url='https://en.ids-imaging.com'
@@ -34,8 +34,8 @@ sha512sums=('3dcb73451ebb96273ce422c5a68818bacf18012f063c69f8fd0b7381c3c6d3d9fd0
             '8069b0b2c07d7ad3d283bea903f38676db8b6402b5a2830335ef14586cb5c1176bca4eeba94aadb534c02a3383c85feec7a048de818edac575543d6fb9ca193e'
             'a65feca40b879b3f9b84bf1a58c0dfd8a891444e39caf48c77a7565efbb4426a57b37e202f4ccf19f724711b96674bf98bb0797317bfc2b008b9f4898d53cb78'
             '05b961501a56b1827986aabc2a5ea8320b711fb0089615b212711814906c52af51205f04ffd9df436510362b185911797176bb6ed71bec4e35db8b1cd4d1f408'
-            '74b18f11d7946d2cc90097dc537b03fda77a5aece9ec999bc48ac6648f7948eba4039c12518bf8f5b1bcb6d7822152374f6f80bf631362104743842a77ba3a65'
-            'd78245b67ca84602dde68db253ce211cce768a7b7e5e175cb3e373e7d831aeaaec243894bd1e170046efa6dc3dc4ca6145742fed324681a5ae1cd65cc0488f8e')
+            '701e2b52ddcbac80a2c59c5e6bddeb636a5197002118a7db4eae868290f91bdb0eaec1e4825914661fd5758f0bf1e80205d6ac6b1c148ee99707cc15ac5ce29b'
+            '6ee23ba61c82b672fa1ad5eba4c1c2218516be9fdb68a7a2f4bd583197b010d28cd78bc8589a732c5f5c83e355e45689d1d43568c3c96dc857d062c9360ef5ec')
 
 prepare() {
 	cd "$srcdir"
@@ -52,10 +52,15 @@ __install_dir() {
 
 	[[ -d "$source_dir" ]] || return 0
 
-
 	for file in $(find "$source_dir" -type f); do
 		install -m "$mode" -D "$file" "$target_dir/${file#${source_dir}/}"
 	done
+
+	for file in $(find "$source_dir" -type l); do
+		target_file="$target_dir/${file#${source_dir}/}"
+		install -m 755 -d "$(dirname "$target_file")"
+		cp --no-dereference --no-target-directory --preserve=links "$file" "$target_file"
+	done
 }
 
 package() {
@@ -63,7 +68,7 @@ package() {
 
 	__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/usr/lib"               "$pkgdir/usr/lib"                 755
 	__install_dir     "$srcdir/lib/firmware/ids/ueye" "$pkgdir/usr/lib/ueyed/firmware"  644
 
 	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/idscameramanager"
@@ -84,7 +89,7 @@ package() {
 	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 -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"
diff --git a/ueye-config-version.cmake b/ueye-config-version.cmake
index ebc016636ee0..dcbb0cb95328 100644
--- a/ueye-config-version.cmake
+++ b/ueye-config-version.cmake
@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "4.91.1")
+set(PACKAGE_VERSION "4.92.0")
 
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
diff --git a/ueye-config.cmake b/ueye-config.cmake
index 290eb7b5e144..d2ec8ec74ce3 100644
--- a/ueye-config.cmake
+++ b/ueye-config.cmake
@@ -1,7 +1,7 @@
 set(ueye_MAJOR_VERSION 4)
-set(ueye_MINOR_VERSION 90)
-set(ueye_PATCH_VERSION 06)
+set(ueye_MINOR_VERSION 92)
+set(ueye_PATCH_VERSION 0)
 set(ueye_VERSION ${ueye_MAJOR_VERSION}.${ueye_MINOR_VERSION}.${ueye_PATCH_VERSION})
 
 add_library(ueye SHARED IMPORTED)
-set_target_properties(ueye PROPERTIES IMPORTED_LOCATION /usr/lib/libueye_api.so)
+set_target_properties(ueye PROPERTIES IMPORTED_LOCATION /usr/lib/libueye_api.so.4.92)