Better PKGBUILD and changed PACKAGE Release #, so to show the relative information after installation, after Fabio's proposal to merge package with r5u87-webcam-drivers.

For this reason, the package number, has been altered to be equal with the latest r5u87-webcam-drivers'.

3 files changed, 62 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2764cd512ee8..6c60f3651335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = r5u87x
-	pkgdesc = Userspace module for Ricoh R5U870 OEM cameras
+	pkgdesc = Userspace modules for Ricoh R5U870 OEM cameras, improved packages and compatibility
 	pkgver = 0.2.2
-	pkgrel = 1
-	epoch = 1
+	pkgrel = 4
 	url = https://gitea.artixlinux.org/linuxer/r5u87x
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	depends = glib2
 	depends = libusb-compat
+	depends = lib32-libusb-compat
 	optdepends = guile: script for extracting firmware from Windows driver
-	source = r5u87x-0.2.2.tar.gz::https://gitea.artixlinux.org/linuxer/r5u87x/archive/0.2.2.tar.gz
-	sha256sums = d87dc965f6fcb2a1c849ff309d8bc4e4669b9b37d73ba875af35f580c5e32036
+	source = https://gitea.artixlinux.org/linuxer/r5u87x/archive/0.2.2.tar.gz
+	b2sums = 77964f77fc7c01a31f7768aa63203f5eb3e961533fe808418dba03c20ef07367caf12927974b1db74b6accbd56070adecbe372abc151b7e8c57af5c52b121638
 
 pkgname = r5u87x
+	install = post.install
 
diff --git a/PKGBUILD b/PKGBUILD
index b8ccf3952265..7c2b62c68b21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
 # Maintainer: linuxer <linuxer@artixlinux.org>
+#             improved packages and compatibility
 # Contributor: Tomasz Maciej Nowak <com[dot]gmail[at]tmn505>
 # Contributor: superlex
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,35 +8,50 @@
 
 pkgname=r5u87x
 pkgver=0.2.2
-pkgrel=1
-epoch=1
-pkgdesc='Userspace module for Ricoh R5U870 OEM cameras'
-arch=(i686 x86_64)
+pkgrel=4
+_alias=r5u87x
+pkgdesc='Userspace modules for Ricoh R5U870 OEM cameras, improved packages and compatibility'
+arch=('i686' 'x86_64')
 url='https://gitea.artixlinux.org/linuxer/r5u87x'
-license=(GPL2)
-depends=(glib2 libusb-compat)
+license=('GPL2')
+depends=('glib2' 'libusb-compat' 'lib32-libusb-compat')
 optdepends=('guile: script for extracting firmware from Windows driver')
-source=("${pkgname}-${pkgver}.tar.gz::https://gitea.artixlinux.org/linuxer/r5u87x/archive/${pkgver}.tar.gz")
-sha256sums=('d87dc965f6fcb2a1c849ff309d8bc4e4669b9b37d73ba875af35f580c5e32036')
+source=("${url}/archive/${pkgver}.tar.gz")
+b2sums=('77964f77fc7c01a31f7768aa63203f5eb3e961533fe808418dba03c20ef07367caf12927974b1db74b6accbd56070adecbe372abc151b7e8c57af5c52b121638')
 
 prepare() {
-	cd "${srcdir}/${pkgname}"
+	mv "${srcdir}/${pkgver}.tar.gz" "${srcdir}/${_alias}.tar.gz"
+	cd ${srcdir}/${_alias}
+
 	# fix udev rule
 	sed -i 's| --reload||' contrib/90-r5u87x-loader.rules.in
 }
 
 build() {
-	cd "${srcdir}/${pkgname}"
+	cd ${srcdir}/${_alias}
+
 	# set UCODE_PATH because we don't install to default location
 	make UCODE_PATH=/usr/lib/firmware/r5u87x-%vid%-%pid%.fw
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
-	make DESTDIR="${pkgdir}" \
+	cd ${srcdir}/${_alias}
+
+	mkdir -p "${pkgdir}/usr/bin"
+	mkdir -p "${pkgdir}/usr/lib/r5u87x/ucode"
+	mkdir -p "${pkgdir}/usr/lib32/r5u87x/ucode"
+	
+    install "${srcdir}/${_alias}/ricoh-webcam-loader" ${pkgdir}/usr/bin
+	
+    make DESTDIR="${pkgdir}" \
 		sbindir="/bin" \
-		firmdir="/lib/firmware" \
+		firmdir="/lib/ucode" \
 		UDEV_INSTALL="/usr/lib/udev/rules.d" \
-		install
-	install recode-fw.scm ${pkgdir}/usr/bin
+        install
+	
+    install recode-fw.scm ${pkgdir}/usr/bin
+	cp -r "${pkgdir}/usr/lib/ucode" "${pkgdir}/usr/lib/r5u87x/"
+	cp -r "${pkgdir}/usr/lib/ucode" "${pkgdir}/usr/lib32/r5u87x/"
+    
+    install=post.install
 }
diff --git a/post.install b/post.install
new file mode 100644
index 000000000000..36445760e75b
--- /dev/null
+++ b/post.install
@@ -0,0 +1,25 @@
+post_install() {
+	echo " ==> ---------------------------------------------------"
+	echo " ==> The following Ricoh Webcam drivers have been added:"
+	echo " ==> ---------------------------------------------------"
+	echo " ==> r5u87x-05ca-1803.fw"
+	echo " ==> r5u87x-05ca-1830.fw"
+	echo " ==> r5u87x-05ca-1834.fw"
+	echo " ==> r5u87x-05ca-1837.fw"
+	echo " ==> r5u87x-05ca-183b.fw"
+	echo " ==> r5u87x-05ca-1870_1.fw"
+	echo " ==> r5u87x-05ca-1810.fw"
+	echo " ==> r5u87x-05ca-1832.fw"
+	echo " ==> r5u87x-05ca-1835.fw"
+	echo " ==> r5u87x-05ca-1839.fw"
+	echo " ==> r5u87x-05ca-183e.fw"
+	echo " ==> r5u87x-05ca-1870.fw"
+	echo " ==> r5u87x-05ca-1812.fw"
+	echo " ==> r5u87x-05ca-1833.fw"
+	echo " ==> r5u87x-05ca-1836.fw"
+	echo " ==> r5u87x-05ca-183a.fw"
+	echo " ==> r5u87x-05ca-1841.fw"
+    echo " ==> ---------------------------------------------------"
+	echo " ==> Start Driver with 'sudo ricoh-webcam-loader'"
+    echo " ==> Enjoy!'"
+}