update to 1.00.36, build directly from samsungs source

4 files changed, 131 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50eb3136b93e..16e8d1e4399b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Dec 17 19:34:03 UTC 2015
 pkgbase = samsung-unified-driver
 	pkgdesc = Unified Linux Driver for Samsung printers and scanners.
-	pkgver = 1.00.35
+	pkgver = 1.00.36
 	pkgrel = 1
 	url = http://www.samsung.com
 	arch = i686
@@ -10,16 +12,11 @@ pkgbase = samsung-unified-driver
 	depends = libusb-compat
 	depends = cups
 	depends = sane
-	noextract = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-driver2-1.00.35_1.00.35-1_amd64.deb
-	noextract = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-ppd-4_1.00.35-1_all.deb
-	noextract = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-driver2-common-1_1-5_all.deb
 	options = !strip
-	source = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-driver2-1.00.35_1.00.35-1_amd64.deb
-	source = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-ppd-4_1.00.35-1_all.deb
-	source = http://www.bchemnet.com/suldr/pool/debian/extra/su/suld-driver2-common-1_1-5_all.deb
-	sha512sums = 449c15f1866ff580bb57896ca00df9fae7439df998bca9e0e50dca0ad025d31c55839dd85c26769fac7499f213d8ab2ae531a706831818d2e39c7aade8b3e09b
-	sha512sums = 91aae9117f7468a870c7ce23a220870bb9a9c945e2f558b2d20d659308c1501ece59c579ab86511b4e2cd374a8b5edabed23c622c932d9cf26e57fcc9d942df3
-	sha512sums = 4bc511981d5ce81f283e764f6cf90d8186df57a673ed75e212777124ba3751beb0601bce75c232cf7bbed00e0646f3e2ed6bf2f361fdf2deabd31ca06d24d4d8
+	source = http://downloadcenter.samsung.com/content/DR/201510/20151028111741150/uld_v1.00.36_00.91.tar.gz
+	source = xerox_mfp-smfp.conf
+	sha512sums = 3f824b1af9dd4dd200a289832289ba44841fc85586322126ff44986d1e44a53fab1f9fba247f02eda784773c44801950d39203ee3e083d4fb6a03526a32d76fc
+	sha512sums = 325d2e3e42bf74663ba0ac3aa0fc3ee70ef5a5197d03c069fac6bc0f8da0d9e12d50e4b59feacef3000eff5a85d3db7f66834809013b18b31532cfea252460ef
 
 pkgname = samsung-unified-driver
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..13d706a30bcc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.*
+/pkg/
+/src/
diff --git a/PKGBUILD b/PKGBUILD
index b4569bd961e2..b2ff37d1708c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Bernd Amend <berndamend gmail com>
+# Maintainer: Christoph Gysin <christoph.gysin@gmail.com>
 
 pkgname=samsung-unified-driver
-pkgver=1.00.35
+pkgver=1.00.36
 pkgrel=1
 
 pkgdesc="Unified Linux Driver for Samsung printers and scanners."
@@ -11,68 +11,66 @@ license=('custom:samsung')
 depends=('libxml2' 'libusb-compat' 'cups' 'sane')
 
 options=(!strip)
+source=(
+    "http://downloadcenter.samsung.com/content/DR/201510/20151028111741150/uld_v${pkgver}_00.91.tar.gz"
+    "xerox_mfp-smfp.conf")
+sha512sums=('3f824b1af9dd4dd200a289832289ba44841fc85586322126ff44986d1e44a53fab1f9fba247f02eda784773c44801950d39203ee3e083d4fb6a03526a32d76fc'
+            '325d2e3e42bf74663ba0ac3aa0fc3ee70ef5a5197d03c069fac6bc0f8da0d9e12d50e4b59feacef3000eff5a85d3db7f66834809013b18b31532cfea252460ef')
 
-if [ "$CARCH" = "i686" ]; then
-	CARCHCUSTOM="i386"
-	sha512sums=('dd01081dede31bc0ce8181df4c834627478d141f3c27a53642b91850ecf94f0f495f3237357f0f0a1b6499c0b65f32e644159f911962bf60f4f43524fed339ed'
-            '91aae9117f7468a870c7ce23a220870bb9a9c945e2f558b2d20d659308c1501ece59c579ab86511b4e2cd374a8b5edabed23c622c932d9cf26e57fcc9d942df3'
-            '4bc511981d5ce81f283e764f6cf90d8186df57a673ed75e212777124ba3751beb0601bce75c232cf7bbed00e0646f3e2ed6bf2f361fdf2deabd31ca06d24d4d8')
-else
-	CARCHCUSTOM="amd64"
-	sha512sums=('449c15f1866ff580bb57896ca00df9fae7439df998bca9e0e50dca0ad025d31c55839dd85c26769fac7499f213d8ab2ae531a706831818d2e39c7aade8b3e09b'
-            '91aae9117f7468a870c7ce23a220870bb9a9c945e2f558b2d20d659308c1501ece59c579ab86511b4e2cd374a8b5edabed23c622c932d9cf26e57fcc9d942df3'
-            '4bc511981d5ce81f283e764f6cf90d8186df57a673ed75e212777124ba3751beb0601bce75c232cf7bbed00e0646f3e2ed6bf2f361fdf2deabd31ca06d24d4d8')
-fi
+package() {
+    if [ "$arch" = "i686" ]; then
+        arch=i386
+    else
+        arch=$CARCH
+    fi
 
-suld_arch="suld-driver2-${pkgver}_${pkgver}-1_${CARCHCUSTOM}.deb"
-suld_ppd="suld-ppd-4_${pkgver}-1_all.deb"
-suld_common="suld-driver2-common-1_1-5_all.deb"
+    mkdir -p "$pkgdir"/etc/sane.d
+    cp "$srcdir"/uld/noarch/etc/smfp.conf "$pkgdir"/etc/sane.d
+    cp "$srcdir"/xerox_mfp-smfp.conf "$pkgdir"/etc/sane.d
 
-source=("http://www.bchemnet.com/suldr/pool/debian/extra/su/${suld_arch}"
-	"http://www.bchemnet.com/suldr/pool/debian/extra/su/${suld_ppd}"
-	"http://www.bchemnet.com/suldr/pool/debian/extra/su/${suld_common}"
-	)
-noextract=("${source[@]%%::*}")
+    mkdir -p "$pkgdir"/etc/sane.d/dll.d
+    echo smfp > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner
+    echo xerox_mfp-smfp > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner-fix
 
-package() {
-	# common
-	rm -rf common
-	mkdir common
-	cd common
-	ar x "../${suld_common}"
-	tar xf data.tar.xz
-	install -d "${pkgdir}/usr/lib/udev/rules.d"
-	install -m 644 -t "${pkgdir}/usr/lib/udev/rules.d/" etc/udev/rules.d/60_smfp_samsung.rules
+    mkdir -p "$pkgdir"/usr/lib
+    cp "$srcdir"/uld/$arch/libscmssc.so "$pkgdir"/usr/lib
+
+    mkdir -p "$pkgdir"/usr/lib/cups/backend
+    cp "$srcdir"/uld/$arch/smfpnetdiscovery "$pkgdir"/usr/lib/cups/backend
+
+    mkdir -p "$pkgdir"/usr/lib/cups/filter
+    cp "$srcdir"/uld/$arch/pstosecps "$pkgdir"/usr/lib/cups/filter
+    cp "$srcdir"/uld/$arch/rastertospl "$pkgdir"/usr/lib/cups/filter
 
-	install -d "${pkgdir}/etc/sane.d/dll.d"
-	install -m 644 -t "${pkgdir}/etc/sane.d/" etc/sane.d/xerox_mfp-smfp.conf
-	install -m 644 -t "${pkgdir}/etc/sane.d/dll.d" etc/sane.d/dll.d/*
+    mkdir -p "$pkgdir"/usr/lib/sane
+    cp "$srcdir"/uld/$arch/libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane
+    ln -s libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so.1
+    ln -s libsane-smfp.so.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so
 
-	install -d "${pkgdir}/usr/share/licenses/samsung-unified-driver"
-	install -m 644 -t "${pkgdir}/usr/share/licenses/samsung-unified-driver" usr/share/doc/suld-driver2/eula-fr.txt usr/share/doc/suld-driver2/copyright.gz
-	install -m 644 usr/share/doc/suld-driver2/eula.txt "${pkgdir}/usr/share/licenses/samsung-unified-driver/LICENSE"
+    mkdir -p "$pkgdir"/usr/lib/udev/rules.d
+    (
+        OEM_FILE="$srcdir"/uld/noarch/oem.conf
+        INSTALL_LOG_FILE=/dev/null
+        source "$srcdir"/uld/noarch/scripting_utils
+        source "$srcdir"/uld/noarch/package_utils
+        source "$srcdir"/uld/noarch/scanner-script.pkg
+        fill_full_template "$srcdir"/uld/noarch/etc/smfp.rules.in "$pkgdir"/usr/lib/udev/rules.d/60_smfp_samsung.rules
+    )
 
-	install -d "${pkgdir}/usr/share/locale/fr/LC_MESSAGES/"
-	install -m 644 -t "${pkgdir}/usr/share/locale/fr/LC_MESSAGES/" usr/share/locale/fr/LC_MESSAGES/sane-smfp.mo
+    mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
+    cp "$srcdir"/uld/noarch/license/eula.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+    cp "$srcdir"/uld/noarch/license/eula-fr.txt "$pkgdir"/usr/share/licenses/$pkgname
 
-	install -d "${pkgdir}/usr/share/doc/samsung-unified-driver/"
-	install -m 644 -t "${pkgdir}/usr/share/doc/samsung-unified-driver/" usr/share/doc/suld-driver2/changelog.gz
-	cd ..
+    cp -r "$srcdir"/uld/noarch/share/locale "$pkgdir"/usr/share
+    rm -f "$pkgdir"/usr/share/locale/fr/LC_MESSAGES/install.mo
 
-	# ppd
-	rm -rf ppd
-	mkdir ppd
-	cd ppd
-	ar x "../${suld_ppd}"
-	tar xf data.tar.xz -C "${pkgdir}"
-	cd ..
+    mkdir -p "$pkgdir"/usr/share/ppd/suld
+    for ppd in "$srcdir"/uld/noarch/share/ppd/*.ppd; do
+        gzip < "$ppd" > "$pkgdir"/usr/share/ppd/suld/"${ppd##*/}".gz
+    done
 
-	# arch
-	rm -rf arch
-	mkdir arch
-	cd arch
-	ar x "../${suld_arch}"
-	tar xf data.tar.xz -C "${pkgdir}"
-	chmod 644 "${pkgdir}/etc/sane.d/smfp.conf"
-	cd ..
+    mkdir -p "$pkgdir"/usr/share/ppd/suld/cms
+    for cts in "$srcdir"/uld/noarch/share/ppd/cms/*.cts; do
+        cp "$cts" "$pkgdir"/usr/share/ppd/suld/cms
+    done
 }
diff --git a/xerox_mfp-smfp.conf b/xerox_mfp-smfp.conf
new file mode 100644
index 000000000000..e081bfc66411
--- /dev/null
+++ b/xerox_mfp-smfp.conf
@@ -0,0 +1,67 @@
+#xerox_mfp-smfp.conf
+
+# Samsung CLX-2160
+usb 0x04e8 0x3425
+
+# Samsung CLX-3170FN & CLX-3175FW
+usb 0x04e8 0x342a
+
+# Samsung CLX-3185
+usb 0x04e8 0x343d
+
+# Samsung CLX-3300
+usb 0x04e8 0x3456
+
+# Samsung M2070
+usb 0x04e8 0x3469
+
+# Samsung SCX-3200 & SCX-3205W
+usb 0x04e8 0x3441
+
+# Samsung SCX-3405W
+usb 0x04e8 0x344f
+
+# Samsung SCX-4100
+usb 0x04e8 0x3413
+
+# Samsung SCX-4200
+usb 0x04e8 0x341b
+
+# Samsung SCX-4216F
+usb 0x04e8 0x3409
+
+# Samsung SCX-4300
+usb 0x04e8 0x342e
+
+# Samsung SCX-4500
+usb 0x04e8 0x3426
+
+# Samsung SCX-4500W
+usb 0x04e8 0x342b
+
+# Samsung SCX-4521F
+usb 0x04e8 0x3419
+
+# Samsung SCX-4600
+usb 0x04e8 0x3433
+
+# Samsung SCX-4623
+usb 0x04e8 0x3434
+
+# Samsung SCX-4623FW
+usb 0x04e8 0x3440
+
+# Samsung SCX-4725FN
+usb 0x04e8 0x341f
+
+# Samsung SCX-4824
+usb 0x04e8 0x342c
+
+# Samsung SCX-4825FN
+usb 0x04e8 0x343c
+
+# Samsung SCX-4828FN (4x28 Series)
+usb 0x04e8 0x342d
+
+# Samsung SCX-4833FD
+usb 0x04e8 0x344b