Update to 4.95.0.

8 files changed, 126 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c52dc53e5a01..703febdfd25f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,12 @@
 pkgbase = ueyed
-	pkgdesc = IDS uEye camera daemon (USB and ethernet)
-	pkgver = 4.94
-	pkgrel = 3
+	pkgver = 4.95.0
+	pkgrel = 1
 	url = https://en.ids-imaging.com
 	install = ueyed.install
 	arch = x86_64
 	license = custom
 	makedepends = patchelf
-	depends = glibc
-	depends = qt5-base
-	backup = etc/ueye/ueyeethd.conf
-	backup = etc/ueye/ueyeusbd.conf
-	source = https://en.ids-imaging.com/files/downloads/ids-software-suite/software/linux-desktop/ids-software-suite-linux-4.94-64.tgz
+	source = https://en.ids-imaging.com/files/downloads/ids-software-suite/software/linux-desktop/ids-software-suite-linux-64-4.95-archive.zip
 	source = ueyeethd.service
 	source = ueyeusbd.service
 	source = ueyeusb.rules
@@ -20,14 +15,28 @@ pkgbase = ueyed
 	source = ueyed-sysusers.conf
 	source = ueye-config.cmake
 	source = ueye-config-version.cmake
-	sha512sums = cdc7b6b364b7d854d453bb497e3f3f03bbcdbf03a61485458c38ff9b06286b182ca8b610b58db86da516bcaca7823615fff8d8362852175213682df905332b04
+	sha512sums = 0999143973254f0cf1c670657db7be9463bc88e3713c8753d5d90a9c485470ce35cebdd867e9634212faaad5b000113242c0c31d5148125a4ed1d2ca060ff15d
 	sha512sums = 9e4156ecfc687b895ecf5055cd97e748760c675e8478caa46c2d19a49f1e2b31000e85a394198b9ab6da40d3b9ede4ffde4f960fc9f8ba7b1a44cffe69b77dbc
 	sha512sums = 82c9729a94acbe674de951a3f96fc6ab1d1257f741f48aaf6c12ad16dde51987f6d45ce09962282feb89bd14b4b5f6bd980ef5fcff499fe3709cf478708d95ff
-	sha512sums = c92de0fa8f5c95ae95a715f70b6dfedb86a566eb80a9b090bb604785837e39ef40e3896d5e8f1f9271647958b87e4cef42dc0ed3a14cc4a1dd77c560d1ad5c4b
-	sha512sums = 8069b0b2c07d7ad3d283bea903f38676db8b6402b5a2830335ef14586cb5c1176bca4eeba94aadb534c02a3383c85feec7a048de818edac575543d6fb9ca193e
-	sha512sums = a65feca40b879b3f9b84bf1a58c0dfd8a891444e39caf48c77a7565efbb4426a57b37e202f4ccf19f724711b96674bf98bb0797317bfc2b008b9f4898d53cb78
+	sha512sums = c85401d7ef4e3eefad01d065dabc9ba5dd899042a1b990af67a9b111b7055708616832e086fdd220be73ad56103d29dd6b26c1837857a54bfb1a1f7e41c97bff
+	sha512sums = 0b61bf73288693696fcc42c51a342e6fe231b4cf4fc2378e20d02d335e0c51ac9c15a8c20466782c8ff2f89adcd2179677007cd4fc6e9838324a58791c5e8e17
+	sha512sums = 65c4bf09982bf697b0e107fb19f1cbcf0552a86b75fd1a3e28fa1d68cc72e5fd6142454418ea62ec63c48c45fec80c6ea2c4da9aa682076d948f5f4408ad8c53
 	sha512sums = 05b961501a56b1827986aabc2a5ea8320b711fb0089615b212711814906c52af51205f04ffd9df436510362b185911797176bb6ed71bec4e35db8b1cd4d1f408
-	sha512sums = 90f7fbae458fd3976cbe9a4e78342d35099a8a05b6b006e3a4521b3825af6ea00ca81180a28a9ce31e502cef570a0fd51adbcf26267813cab917f16a366c46c1
-	sha512sums = e90d3afd1a8afd4027d75c268cb2700709841cbbee9af767525f135a6c0b458f5e5f62624f5ff12a400303fa10e1c7608da2194237f5c3e6a9521bdf513843fc
+	sha512sums = a5be4a6029fba4956f1640866552a59e3fc20092ce7f58f9c70a0e181b294f1807acc1b3da882e44846fae1f96525b6b67a2e76a305aace63d1ac3824f88df41
+	sha512sums = f8c034f091263143858c9f8d54339acbff58641a0120a52e07fae8e12266055df823fbda378d16f54ff85620fb341a03db473ba2744af79c61ef6e2a6579e8a7
 
 pkgname = ueyed
+	pkgdesc = IDS uEye camera daemon (USB and ethernet)
+	depends = glibc
+	depends = openmp
+	depends = qt5-base
+	backup = etc/ueye/ueyeethd.conf
+	backup = etc/ueye/ueyeusbd.conf
+
+pkgname = ueyed-doc-en
+	pkgdesc = IDS uEye documentation (english)
+	arch = any
+
+pkgname = ueyed-doc-de
+	pkgdesc = IDS uEye documentation (german)
+	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index d35bebd7fe1c..efbd61593e6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,17 @@
 # Maintainer: Maarten de Vries <maarten@de-vri.es>
 
-pkgname=ueyed
-pkgdesc="IDS uEye camera daemon (USB and ethernet)"
-pkgver=4.94
-pkgrel=3
+pkgbase=ueyed
+pkgname=(ueyed ueyed-doc-en ueyed-doc-de)
+pkgver=4.95.0
+pkgrel=1
 arch=(x86_64)
 license=(custom)
 url='https://en.ids-imaging.com'
-depends=('glibc' 'qt5-base')
 makedepends=('patchelf')
 install="$pkgname.install"
-backup=(
-	'etc/ueye/ueyeethd.conf'
-	'etc/ueye/ueyeusbd.conf'
-)
 
 source=(
-	"https://en.ids-imaging.com/files/downloads/ids-software-suite/software/linux-desktop/ids-software-suite-linux-$pkgver-64.tgz"
+	"https://en.ids-imaging.com/files/downloads/ids-software-suite/software/linux-desktop/ids-software-suite-linux-64-4.95-archive.zip"
 	"ueyeethd.service"
 	"ueyeusbd.service"
 	"ueyeusb.rules"
@@ -28,77 +23,107 @@ source=(
 )
 
 sha512sums=(
-	'cdc7b6b364b7d854d453bb497e3f3f03bbcdbf03a61485458c38ff9b06286b182ca8b610b58db86da516bcaca7823615fff8d8362852175213682df905332b04'
+	'0999143973254f0cf1c670657db7be9463bc88e3713c8753d5d90a9c485470ce35cebdd867e9634212faaad5b000113242c0c31d5148125a4ed1d2ca060ff15d'
 	'9e4156ecfc687b895ecf5055cd97e748760c675e8478caa46c2d19a49f1e2b31000e85a394198b9ab6da40d3b9ede4ffde4f960fc9f8ba7b1a44cffe69b77dbc'
 	'82c9729a94acbe674de951a3f96fc6ab1d1257f741f48aaf6c12ad16dde51987f6d45ce09962282feb89bd14b4b5f6bd980ef5fcff499fe3709cf478708d95ff'
-	'c92de0fa8f5c95ae95a715f70b6dfedb86a566eb80a9b090bb604785837e39ef40e3896d5e8f1f9271647958b87e4cef42dc0ed3a14cc4a1dd77c560d1ad5c4b'
-	'8069b0b2c07d7ad3d283bea903f38676db8b6402b5a2830335ef14586cb5c1176bca4eeba94aadb534c02a3383c85feec7a048de818edac575543d6fb9ca193e'
-	'a65feca40b879b3f9b84bf1a58c0dfd8a891444e39caf48c77a7565efbb4426a57b37e202f4ccf19f724711b96674bf98bb0797317bfc2b008b9f4898d53cb78'
+	'c85401d7ef4e3eefad01d065dabc9ba5dd899042a1b990af67a9b111b7055708616832e086fdd220be73ad56103d29dd6b26c1837857a54bfb1a1f7e41c97bff'
+	'0b61bf73288693696fcc42c51a342e6fe231b4cf4fc2378e20d02d335e0c51ac9c15a8c20466782c8ff2f89adcd2179677007cd4fc6e9838324a58791c5e8e17'
+	'65c4bf09982bf697b0e107fb19f1cbcf0552a86b75fd1a3e28fa1d68cc72e5fd6142454418ea62ec63c48c45fec80c6ea2c4da9aa682076d948f5f4408ad8c53'
 	'05b961501a56b1827986aabc2a5ea8320b711fb0089615b212711814906c52af51205f04ffd9df436510362b185911797176bb6ed71bec4e35db8b1cd4d1f408'
-	'90f7fbae458fd3976cbe9a4e78342d35099a8a05b6b006e3a4521b3825af6ea00ca81180a28a9ce31e502cef570a0fd51adbcf26267813cab917f16a366c46c1'
-	'e90d3afd1a8afd4027d75c268cb2700709841cbbee9af767525f135a6c0b458f5e5f62624f5ff12a400303fa10e1c7608da2194237f5c3e6a9521bdf513843fc'
+	'a5be4a6029fba4956f1640866552a59e3fc20092ce7f58f9c70a0e181b294f1807acc1b3da882e44846fae1f96525b6b67a2e76a305aace63d1ac3824f88df41'
+	'f8c034f091263143858c9f8d54339acbff58641a0120a52e07fae8e12266055df823fbda378d16f54ff85620fb341a03db473ba2744af79c61ef6e2a6579e8a7'
 )
 
 prepare() {
-	cd "$srcdir"
+	shopt -s nullglob
 
-	tail +149 "ueye_4.94.0.1229_amd64.run" | tar -xz
+	cd "$srcdir"
+	rm "ueye_4.95.0.1134_amd64.run"
+
+	rm -rf packages
+	mkdir -p packages
+	cd packages
+	bsdtar -xf ../ueye_4.95.0.1134_amd64.tar.gz
+	rm ueyesetup
+
+	mkdir -p ../extracted
+	for archive in *.tar.gz; do
+		msg2 "Extracting %s" "$archive"
+		bsdtar -xf "$archive" -C ../extracted
+	done
 
-	rm "$srcdir/usr/bin/ueyesetup"
+	cd "$srcdir"
+	rm extracted/opt/ids/ueye/bin/ueyesetup
 }
 
-__install_dir() {
-	local source_dir="$1"
-	local target_dir="$2"
-	local mode="$3"
+package_ueyed() {
+	pkgdesc="IDS uEye camera daemon (USB and ethernet)"
+	depends=('glibc' 'openmp' 'qt5-base')
+	backup=(
+		'etc/ueye/ueyeethd.conf'
+		'etc/ueye/ueyeusbd.conf'
+	)
 
-	[[ -d "$source_dir" ]] || return 0
+	cd "$srcdir"
+	cp -dr extracted/opt "$pkgdir/"
+	cp -dr extracted/usr "$pkgdir/"
+	rm -r "$pkgdir/opt/ids/ueye/manual"
+
+	mv "$pkgdir/opt/ids/ueye/lib/libueye_api.so" "$pkgdir/opt/ids/ueye/lib/libueye_api.so.1"
+	ln -s libueye_api.so.1 "$pkgdir/opt/ids/ueye/lib/libueye_api.so"
+	patchelf --replace-needed libomp.so.5 libomp.so "$pkgdir/opt/ids/ueye/lib/libueye_api.so.1"
+
+	install -d -m 755 "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/idscameramanager" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyedemo" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyeethd" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyehotpixeleditor" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyemakeconfig" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyereport" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyesetid" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyesetip" "$pkgdir/usr/bin"
+	ln -s  "/opt/ids/ueye/bin/ueyeusbd" "$pkgdir/usr/bin"
+
+	install -d -m 755 "$pkgdir/usr/lib"
+	ln -s  "/opt/ids/ueye/lib/libueye_api.so.1" "$pkgdir/usr/lib"
+	ln -s  "libueye_api.so.1" "$pkgdir/usr/lib/libueye_api.so"
+
+	install -d -m 755 "$pkgdir/usr/include/"
+	ln -s  "/opt/ids/ueye/include/ueye.h" "$pkgdir/usr/include"
+	ln -s  "/opt/ids/ueye/include/ueye_deprecated.h" "$pkgdir/usr/include"
+
+	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 -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/opt/ids/ueye/bin/idscameramanager"
+	patchelf --remove-rpath "$pkgdir/opt/ids/ueye/bin/ueyedemo"
+	patchelf --remove-rpath "$pkgdir/opt/ids/ueye/bin/ueyeethd"
+	patchelf --remove-rpath "$pkgdir/opt/ids/ueye/bin/ueyesetid"
+	patchelf --remove-rpath "$pkgdir/opt/ids/ueye/bin/ueyesetip"
+	patchelf --remove-rpath "$pkgdir/opt/ids/ueye/bin/ueyeusbd"
+}
 
-	for file in $(find "$source_dir" -type f); do
-		install -m "$mode" -D "$file" "$target_dir/${file#${source_dir}/}"
-	done
+package_ueyed-doc-en() {
+	pkgdesc="IDS uEye documentation (english)"
+	arch=(any)
 
-	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
+	cd "$srcdir"
+	install -d -m 755 "$pkgdir/opt/ids/ueye/manual/"
+	cp -dr extracted/opt/ids/ueye/manual/en "$pkgdir/opt/ids/ueye/manual/"
 }
 
-package() {
-	cd "$srcdir"
+package_ueyed-doc-de() {
+	pkgdesc="IDS uEye documentation (german)"
+	arch=(any)
 
-	__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"                 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"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyedemo"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyeethd"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyemakeconfig"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyereport"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyesetid"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyesetip"
-	install -D -m 755 -t "$pkgdir/usr/bin" "$srcdir/usr/bin/ueyeusbd"
-	# Notably missing: ueyesetup
-	# 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 -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"
-	patchelf --remove-rpath "$pkgdir/usr/bin/ueyeethd"
-	patchelf --remove-rpath "$pkgdir/usr/bin/ueyesetid"
-	patchelf --remove-rpath "$pkgdir/usr/bin/ueyesetip"
-	patchelf --remove-rpath "$pkgdir/usr/bin/ueyeusbd"
+	cd "$srcdir"
+	install -d -m 755 "$pkgdir/opt/ids/ueye/manual/"
+	cp -dr extracted/opt/ids/ueye/manual/de "$pkgdir/opt/ids/ueye/manual/"
 }
diff --git a/ueye-config-version.cmake b/ueye-config-version.cmake
index b88d49aae827..ee1244784ef9 100644
--- a/ueye-config-version.cmake
+++ b/ueye-config-version.cmake
@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "4.94.0")
+set(PACKAGE_VERSION "4.95.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 4207d6e167ed..d41f9ac3e425 100644
--- a/ueye-config.cmake
+++ b/ueye-config.cmake
@@ -1,7 +1,7 @@
 set(ueye_MAJOR_VERSION 4)
-set(ueye_MINOR_VERSION 94)
+set(ueye_MINOR_VERSION 95)
 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.4.94)
+set_target_properties(ueye PROPERTIES IMPORTED_LOCATION /usr/lib/libueye_api.so.1)
diff --git a/ueyed.install b/ueyed.install
index 56f13794558a..ff4838c1479f 100644
--- a/ueyed.install
+++ b/ueyed.install
@@ -1,8 +1,3 @@
-_config_message() {
-	echo "The ethernet daemon must be configured using /etc/ueye/ueyeethd.conf"
-	echo "You also need to make sure /usr/bin/ueyeethdnotify or /usr/bin/ueyenotify is called when an interface comes up or down."
-}
-
 post_install() {
-	_config_message
+	echo "The ethernet daemon must be configured using /etc/ueye/ueyeethd.conf"
 }
diff --git a/ueyeethd.conf b/ueyeethd.conf
index 950dfc083128..36464a7a2b90 100644
--- a/ueyeethd.conf
+++ b/ueyeethd.conf
@@ -1,3 +1,4 @@
 [Parameters]
-EthFirmwarePath = /usr/lib/ueyed/firmware/eth/
+EthFirmwarePath = /opt/ids/ueye/firmware/eth/
+EthAddonPath = /opt/ids/ueye/firmware/eth_addon/
 Interfaces = eth0
diff --git a/ueyeusb.rules b/ueyeusb.rules
index 9723351b10d4..9897af0707a5 100644
--- a/ueyeusb.rules
+++ b/ueyeusb.rules
@@ -1,2 +1 @@
-SUBSYSTEM=="usb",         ATTR{idVendor}=="1409", OWNER="ueyed", GROUP="ueyed", MODE="0660", TAG+="UACCESS"
-SUBSYSTEM=="usb_device", ATTRS{idVendor}=="1409", OWNER="ueyed", GROUP="ueyed", MODE="0660", TAG+="UACCESS"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="1409", ATTR{idProduct}!="8000", OWNER="ueyed", GROUP="ueyed", MODE="0660", TAG+="UACCESS"
diff --git a/ueyeusbd.conf b/ueyeusbd.conf
index 4f97abed496d..426f9d46c646 100644
--- a/ueyeusbd.conf
+++ b/ueyeusbd.conf
@@ -1,4 +1,5 @@
 [Parameters]
-Usb3FirmwarePath            = /usr/lib/ueyed/firmware/usb3/
-Usb3AddonFirmwarePath       = /usr/lib/ueyed/firmware/usb3_addon/
-DeviceSequentialArrangement = 300
+Usb2FirmwarePath = /opt/ids/ueye/firmware/usb2/
+Usb2AddonPath = /opt/ids/ueye/firmware/usb2_addon/
+Usb3FirmwarePath = /opt/ids/ueye/firmware/usb3/
+Usb3AddonPath = /opt/ids/ueye/firmware/usb3_addon/