revision

3 files changed, 17 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c60f3651335..bf2f40f4379d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = r5u87x
-	pkgdesc = Userspace modules for Ricoh R5U870 OEM cameras, improved packages and compatibility
+	pkgdesc = Userspace module for Ricoh R5U870 OEM cameras
 	pkgver = 0.2.2
-	pkgrel = 4
+	pkgrel = 2
+	epoch = 1
 	url = https://gitea.artixlinux.org/linuxer/r5u87x
 	arch = i686
 	arch = x86_64
@@ -10,9 +11,8 @@ pkgbase = r5u87x
 	depends = libusb-compat
 	depends = lib32-libusb-compat
 	optdepends = guile: script for extracting firmware from Windows driver
-	source = https://gitea.artixlinux.org/linuxer/r5u87x/archive/0.2.2.tar.gz
-	b2sums = 77964f77fc7c01a31f7768aa63203f5eb3e961533fe808418dba03c20ef07367caf12927974b1db74b6accbd56070adecbe372abc151b7e8c57af5c52b121638
+	source = r5u87x-0.2.2.tar.gz::https://gitea.artixlinux.org/linuxer/r5u87x/archive/0.2.2.tar.gz
+	sha256sums = d87dc965f6fcb2a1c849ff309d8bc4e4669b9b37d73ba875af35f580c5e32036
 
 pkgname = r5u87x
-	install = post.install
 
diff --git a/PKGBUILD b/PKGBUILD
index 7c2b62c68b21..cc262f5194e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # 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 >
@@ -8,40 +7,37 @@
 
 pkgname=r5u87x
 pkgver=0.2.2
-pkgrel=4
-_alias=r5u87x
-pkgdesc='Userspace modules for Ricoh R5U870 OEM cameras, improved packages and compatibility'
-arch=('i686' 'x86_64')
+pkgrel=2
+epoch=1
+pkgdesc='Userspace module for Ricoh R5U870 OEM cameras'
+arch=(i686 x86_64)
 url='https://gitea.artixlinux.org/linuxer/r5u87x'
-license=('GPL2')
-depends=('glib2' 'libusb-compat' 'lib32-libusb-compat')
+license=(GPL2)
+depends=(glib2 libusb-compat lib32-libusb-compat)
 optdepends=('guile: script for extracting firmware from Windows driver')
-source=("${url}/archive/${pkgver}.tar.gz")
-b2sums=('77964f77fc7c01a31f7768aa63203f5eb3e961533fe808418dba03c20ef07367caf12927974b1db74b6accbd56070adecbe372abc151b7e8c57af5c52b121638')
+source=("${pkgname}-${pkgver}.tar.gz::https://gitea.artixlinux.org/linuxer/r5u87x/archive/${pkgver}.tar.gz")
+sha256sums=('d87dc965f6fcb2a1c849ff309d8bc4e4669b9b37d73ba875af35f580c5e32036')
 
 prepare() {
-	mv "${srcdir}/${pkgver}.tar.gz" "${srcdir}/${_alias}.tar.gz"
-	cd ${srcdir}/${_alias}
-
+	cd "${srcdir}/${pkgname}"
 	# fix udev rule
 	sed -i 's| --reload||' contrib/90-r5u87x-loader.rules.in
 }
 
 build() {
-	cd ${srcdir}/${_alias}
-
+	cd "${srcdir}/${pkgname}"
 	# set UCODE_PATH because we don't install to default location
 	make UCODE_PATH=/usr/lib/firmware/r5u87x-%vid%-%pid%.fw
 }
 
 package() {
-	cd ${srcdir}/${_alias}
+	cd "${srcdir}/${pkgname}"
 
 	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
+    install "${srcdir}/${pkgname}/ricoh-webcam-loader" ${pkgdir}/usr/bin
 	
     make DESTDIR="${pkgdir}" \
 		sbindir="/bin" \
@@ -52,6 +48,4 @@ package() {
     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
deleted file mode 100644
index 36445760e75b..000000000000
--- a/post.install
+++ /dev/null
@@ -1,25 +0,0 @@
-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!'"
-}