Update deps, cleanup

3 files changed, 62 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bbc621027f7..e05ed8431cf6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-# Generated by mksrcinfo v8
-# Mon Dec 31 12:10:53 UTC 2018
 pkgbase = jdatestamp
-	pkgdesc = utility to losslessly imprint date/time of a picture taken in a digital camera into its JPEG image
+	pkgdesc = losslessly imprint date/time of a picture into its JPEG image
 	pkgver = 1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/jdatestamp/
 	arch = i686
 	arch = x86_64
 	license = custom
-	depends = libjpeg-droppatch
 	depends = freetype2
+	depends = libjpeg9
 	source = http://sourceforge.net/projects/jdatestamp/files/jdatestamp/1.2/jdatestamp-1.2-src.tar.gz/download
+	source = jpegtran_binary.patch
 	md5sums = eaf9075f17780c6ef50f40e0865b28d1
+	md5sums = e0036c42274bf6fd265fec8debd04803
 
 pkgname = jdatestamp
 
diff --git a/PKGBUILD b/PKGBUILD
index e2efeb80cb3b..535165d7970f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,33 @@
 
 pkgname=jdatestamp
 pkgver=1.2
-pkgrel=1
-pkgdesc='utility to losslessly imprint date/time of a picture taken in a digital camera into its JPEG image'
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc='losslessly imprint date/time of a picture into its JPEG image'
+arch=(i686 x86_64)
 url="http://sourceforge.net/projects/jdatestamp/"
-license=('custom')
-depends=('libjpeg-droppatch' 'freetype2')
-source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz/download)
-md5sums=('eaf9075f17780c6ef50f40e0865b28d1')
+license=(custom)
+depends=(freetype2 libjpeg9)
+source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz/download
+        jpegtran_binary.patch)
+md5sums=('eaf9075f17780c6ef50f40e0865b28d1'
+         'e0036c42274bf6fd265fec8debd04803')
+
+prepare() {
+  cd ${srcdir}/$pkgname-$pkgver-src
+  patch -p2 -i "${srcdir}/jpegtran_binary.patch"
+}
 
 build() {
-cd ${srcdir}/$pkgname-$pkgver-src
-sed -i -e 's/LIBJPEG =.*/LIBJPEG =\/usr/' -e 's/FREETYPE2 =.*/FREETYPE2 =\/usr/' -e '/STATICLIBS/s/-Wl,//' makefile
-make
+  cd ${srcdir}/$pkgname-$pkgver-src
+  sed -i -e 's/LIBJPEG =.*/LIBJPEG =\/usr/' -e 's/FREETYPE2 =.*/FREETYPE2 =\/usr/' -e '/STATICLIBS/s/-Wl,//' makefile
+  make
 }
 
 package() {
-cd ${srcdir}/$pkgname-$pkgver-src
-mkdir -p ${pkgdir}/usr/{share/doc/jdatestamp,bin}
-install -D -m755 ./jdatestamp ${pkgdir}/usr/share/jdatestamp/jdatestamp
-install -D -m644 installFiles/* ${pkgdir}/usr/share/jdatestamp || true
-install -D -m644 installFiles/docs/* ${pkgdir}/usr/share/doc/jdatestamp || true
-ln -s /usr/share/jdatestamp/jdatestamp ${pkgdir}/usr/bin/jdatestamp
+  cd ${srcdir}/$pkgname-$pkgver-src
+  mkdir -p ${pkgdir}/usr/{share/{doc/jdatestamp,jdatestamp/installFiles},bin}
+  install -Dm755 ./jdatestamp ${pkgdir}/usr/share/jdatestamp/jdatestamp
+  install -Dm644 installFiles/*.txt ${pkgdir}/usr/share/jdatestamp
+  install -Dm644 installFiles/docs/* ${pkgdir}/usr/share/doc/jdatestamp
+  ln -s /usr/share/jdatestamp/jdatestamp ${pkgdir}/usr/bin/jdatestamp
 }
diff --git a/jpegtran_binary.patch b/jpegtran_binary.patch
new file mode 100644
index 000000000000..c3e2b8e9bd69
--- /dev/null
+++ b/jpegtran_binary.patch
@@ -0,0 +1,34 @@
+diff -aur src.orig/jdatestamp-1.2-src/jdatestamp.c src/jdatestamp-1.2-src/jdatestamp.c
+--- src.orig/jdatestamp-1.2-src/jdatestamp.c	2021-04-20 10:19:32.588069127 +0200
++++ src/jdatestamp-1.2-src/jdatestamp.c	2021-04-20 10:19:50.501395534 +0200
+@@ -891,7 +891,7 @@
+             cutoutInfo.width, cutoutInfo.height, x, y);
+ 
+     /* Crop out required section using jpegtran */
+-    sprintf(g_TStr, "jpegtran -crop %dx%d+%d+%d -outfile \"%s\" \"%s\"",
++    sprintf(g_TStr, "jpegtran9 -crop %dx%d+%d+%d -outfile \"%s\" \"%s\"",
+             cutoutInfo.width, cutoutInfo.height, x, y, g_cropFile,
+             inpFile);
+ 
+@@ -945,10 +945,10 @@
+         copyOption = "";
+ 
+     if(opFile != NULL)
+-        sprintf(g_TStr, "jpegtran -drop +%d+%d \"%s\" %s-outfile \"%s\" \"%s\"",
++        sprintf(g_TStr, "jpegtran9 -drop +%d+%d \"%s\" %s-outfile \"%s\" \"%s\"",
+             cutoutInfo.x, cutoutInfo.y, g_cropFile, copyOption, opFile, inpFile);
+     else
+-        sprintf(g_TStr, "jpegtran -drop +%d+%d \"%s\" %s\"%s\"",
++        sprintf(g_TStr, "jpegtran9 -drop +%d+%d \"%s\" %s\"%s\"",
+             cutoutInfo.x, cutoutInfo.y, g_cropFile, copyOption, inpFile);
+ 
+     JDSTMP_DEBUG("Dropping cropped section with command '%s'\n", g_TStr);
+diff -aur src.orig/jdatestamp-1.2-src/jpegtran src/jdatestamp-1.2-src/jpegtran
+--- src.orig/jdatestamp-1.2-src/jpegtran	2021-04-20 10:19:32.588069127 +0200
++++ src/jdatestamp-1.2-src/jpegtran	2021-04-20 10:19:53.338061056 +0200
+@@ -2,4 +2,4 @@
+ 
+ rootDir=`dirname $0`
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootDir/lib
+-$rootDir/bin/jpegtran $*
++$rootDir/bin/jpegtran9 $*