[arch-commits] Commit in jpeg-archive/trunk (3 files)

[Lukas Fleischer]

    Date: Saturday, August 18, 2018 @ 16:57:09
  Author: lfleischer
Revision: 372666

upgpkg: jpeg-archive 2.2.0-1

Upstream update.

Modified:
  jpeg-archive/trunk/PKGBUILD
Deleted:
  jpeg-archive/trunk/Fix-path-to-libjpeg-a.patch
  jpeg-archive/trunk/Replace-ladon-with-GNU-parallel.patch

---------------------------------------+
 Fix-path-to-libjpeg-a.patch           |   17 ----------
 PKGBUILD                              |   31 ++----------------
 Replace-ladon-with-GNU-parallel.patch |   54 --------------------------------
 3 files changed, 4 insertions(+), 98 deletions(-)

Deleted: Fix-path-to-libjpeg-a.patch
===================================================================
--- Fix-path-to-libjpeg-a.patch	2018-08-18 16:38:27 UTC (rev 372665)
+++ Fix-path-to-libjpeg-a.patch	2018-08-18 16:57:09 UTC (rev 372666)
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b16531e..f0f0e10 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,11 +11,7 @@ ifeq ($(UNAME_S),Linux)
- 	# Linux (e.g. Ubuntu)
- 	MOZJPEG_PREFIX ?= /opt/mozjpeg
- 	CFLAGS += -I$(MOZJPEG_PREFIX)/include
--	ifeq ($(UNAME_M),x86_64)
--		LIBJPEG = $(MOZJPEG_PREFIX)/lib64/libjpeg.a
--	else
--		LIBJPEG = $(MOZJPEG_PREFIX)/lib/libjpeg.a
--	endif
-+	LIBJPEG = $(MOZJPEG_PREFIX)/lib/libjpeg.a
- else
- 	ifeq ($(UNAME_S),Darwin)
- 		# Mac OS X

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 16:38:27 UTC (rev 372665)
+++ PKGBUILD	2018-08-18 16:57:09 UTC (rev 372666)
@@ -1,10 +1,9 @@
-# $Id$
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Maintainer: arjan5 <aur at anymore.nl>
 
 pkgname=jpeg-archive
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc='Utilities for archiving JPEGs for long term storage'
 arch=(x86_64)
 url="https://github.com/danielgtaylor/jpeg-archive/"
@@ -14,40 +13,18 @@
 optdepends=('parallel: for jpeg-archive'
             'dcraw: for jpeg-archive'
             'perl-image-exiftool: for jpeg-archive')
-_commit=fc331be551a734372437fb71bdf1e595e6b5724c # 2.1.1
+_commit=f51c5cefeb9fe5207835cc9cc2422f3950ab787a # 2.2.0
 _mozjpeg_commit=72d249b89ca348c991d5e27c82cf32ba0f12d05a # v3.2
 source=(git://github.com/danielgtaylor/jpeg-archive.git#commit=$_commit
         git://github.com/mozilla/mozjpeg.git#commit=$_mozjpeg_commit
-        Fix-path-to-libjpeg-a.patch
-        Replace-ladon-with-GNU-parallel.patch
         parallel.config)
 md5sums=('SKIP'
          'SKIP'
-         'fee4531e218dc868ccfa5f7a1ab03e48'
-         '077f16cb6a5206819fbf2d0f1e80c1be'
          '1534de688b10c4dad77ccfbffecb9a59')
 
-prepare() {
-  cd "$srcdir/jpeg-archive"
-
-  # Ignore empty lines in PPM header# 
-  git cherry-pick -n 8d687e1b0da1df57cc28322bc2e0e09998e2981a
-
-  # Fix bash IF 'unary operator expected' error
-  git cherry-pick -n 2d6e03b7c089319f8f55a6f36f6100ece5712faf
-
-  # Ignore lib64 silliness
-  patch -p1 -i "$srcdir/Fix-path-to-libjpeg-a.patch"
-
-  # Replace ladon with GNU parallel
-  patch -p1 -i "$srcdir/Replace-ladon-with-GNU-parallel.patch"
-
+build() {
   cd "$srcdir/mozjpeg"
   autoreconf -fiv
-}
-
-build() {
-  cd "$srcdir/mozjpeg"
   ./configure --with-jpeg8 --prefix="$srcdir/jpeg-archive/mozjpeg"
   make
   make install

Deleted: Replace-ladon-with-GNU-parallel.patch
===================================================================
--- Replace-ladon-with-GNU-parallel.patch	2018-08-18 16:38:27 UTC (rev 372665)
+++ Replace-ladon-with-GNU-parallel.patch	2018-08-18 16:57:09 UTC (rev 372666)
@@ -1,54 +0,0 @@
-From 8c3743f8b75875dd712ab4e9f168c3a7cbbac20c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at archlinux.org>
-Date: Mon, 31 Jul 2017 18:31:57 +0200
-Subject: [PATCH] Replace ladon with GNU parallel
-
----
- jpeg-archive | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/jpeg-archive b/jpeg-archive
-index 551255d..5ecdccd
---- a/jpeg-archive
-+++ b/jpeg-archive
-@@ -1,6 +1,8 @@
- #!/bin/bash
-+shopt -s globstar
-+shopt -s extglob
- 
--# This script requires ladon, dcraw, exiftool, and jpeg-recompress
-+# This script requires GNU parallel, dcraw, exiftool, and jpeg-recompress
- # Usage:
- #   $ cd path/to/photos
- #   $ jpeg-archive
-@@ -22,18 +24,24 @@ fi
- 
- set -e
- 
-+# Common parallel arguments
-+PARALLEL_ARGS=(
-+    '--profile /usr/share/jpeg-archive/parallel.config'
-+    --no-notice
-+)
-+
- # Cleanup old files
- rm -rf Comp
- rm -rf /tmp/comp
- 
- echo 'Converting RAW files...'
--ladon -m /tmp/comp/RELDIR '**/*.+(cr2|nef|dng)' -- "dcraw -w -q 3 -c RELPATH | jpeg-recompress ${@:--q high} --ppm - /tmp/comp/RELDIR/BASENAME.jpg"
-+parallel ${PARALLEL_ARGS[@]} "mkdir -p /tmp/comp/RELDIR; dcraw -w -q 3 -c RELPATH | jpeg-recompress ${@:--q high} --ppm - /tmp/comp/RELDIR/BASENAME.jpg" ::: **/*.+(cr2|nef|dng)
- 
- echo 'Copying EXIF data...'
--ladon '**/*.+(cr2|nef|dng)' -- exiftool -overwrite_original -TagsFromFile RELPATH -all:all /tmp/comp/RELDIR/BASENAME.jpg
-+parallel ${PARALLEL_ARGS[@]} 'exiftool -overwrite_original -TagsFromFile RELPATH -all:all /tmp/comp/RELDIR/BASENAME.jpg' ::: **/*.+(cr2|nef|dng)
- 
- echo 'Recompressing JPEG files'
--ladon -m /tmp/comp/RELDIR '**/*.jpg' -- jpeg-recompress ${@:--q high} RELPATH /tmp/comp/RELPATH
-+parallel ${PARALLEL_ARGS[@]} "mkdir -p /tmp/comp/RELDIR; jpeg-recompress ${@:--q high} RELPATH /tmp/comp/RELPATH" ::: **/*.jpg
- 
- mv /tmp/comp Comp
- 
--- 
-2.13.3
-