[arch-commits] Commit in jpeg-archive/repos (6 files)

[Bartłomiej Piotrowski]

    Date: Thursday, June 29, 2017 @ 11:21:39
  Author: bpiotrowski
Revision: 241570

archrelease: copy trunk to community-x86_64, community-i686

Added:
  jpeg-archive/repos/community-i686/
  jpeg-archive/repos/community-i686/Fix-path-to-libjpeg-a.patch
    (from rev 241569, jpeg-archive/trunk/Fix-path-to-libjpeg-a.patch)
  jpeg-archive/repos/community-i686/PKGBUILD
    (from rev 241569, jpeg-archive/trunk/PKGBUILD)
  jpeg-archive/repos/community-x86_64/
  jpeg-archive/repos/community-x86_64/Fix-path-to-libjpeg-a.patch
    (from rev 241569, jpeg-archive/trunk/Fix-path-to-libjpeg-a.patch)
  jpeg-archive/repos/community-x86_64/PKGBUILD
    (from rev 241569, jpeg-archive/trunk/PKGBUILD)

----------------------------------------------+
 community-i686/Fix-path-to-libjpeg-a.patch   |   17 +++++++
 community-i686/PKGBUILD                      |   55 +++++++++++++++++++++++++
 community-x86_64/Fix-path-to-libjpeg-a.patch |   17 +++++++
 community-x86_64/PKGBUILD                    |   55 +++++++++++++++++++++++++
 4 files changed, 144 insertions(+)

Copied: jpeg-archive/repos/community-i686/Fix-path-to-libjpeg-a.patch (from rev 241569, jpeg-archive/trunk/Fix-path-to-libjpeg-a.patch)
===================================================================
--- community-i686/Fix-path-to-libjpeg-a.patch	                        (rev 0)
+++ community-i686/Fix-path-to-libjpeg-a.patch	2017-06-29 11:21:39 UTC (rev 241570)
@@ -0,0 +1,17 @@
+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

Copied: jpeg-archive/repos/community-i686/PKGBUILD (from rev 241569, jpeg-archive/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-06-29 11:21:39 UTC (rev 241570)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: arjan5 <aur at anymore.nl>
+
+pkgname=jpeg-archive
+pkgver=2.1.1
+pkgrel=1
+pkgdesc='Utilities for archiving JPEGs for long term storage'
+arch=(x86_64 i686)
+url="https://github.com/danielgtaylor/jpeg-archive/"
+license=(MIT)
+depends=(bash)
+makedepends=(git nasm)
+_commit=fc331be551a734372437fb71bdf1e595e6b5724c # 2.1.1
+_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)
+md5sums=('SKIP'
+         'SKIP'
+         'fee4531e218dc868ccfa5f7a1ab03e48')
+
+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"
+
+  cd "$srcdir/mozjpeg"
+  autoreconf -fiv
+}
+
+build() {
+  cd "$srcdir/mozjpeg"
+  ./configure --with-jpeg8 --prefix="$srcdir/jpeg-archive/mozjpeg"
+  make
+  make install
+
+  cd "$srcdir/jpeg-archive"
+  MOZJPEG_PREFIX="$srcdir/jpeg-archive/mozjpeg" make
+}
+
+package() {
+  cd "$srcdir/jpeg-archive"
+  make PREFIX="$pkgdir/usr" install
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  tail -n7 README.md > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: jpeg-archive/repos/community-x86_64/Fix-path-to-libjpeg-a.patch (from rev 241569, jpeg-archive/trunk/Fix-path-to-libjpeg-a.patch)
===================================================================
--- community-x86_64/Fix-path-to-libjpeg-a.patch	                        (rev 0)
+++ community-x86_64/Fix-path-to-libjpeg-a.patch	2017-06-29 11:21:39 UTC (rev 241570)
@@ -0,0 +1,17 @@
+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

Copied: jpeg-archive/repos/community-x86_64/PKGBUILD (from rev 241569, jpeg-archive/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-06-29 11:21:39 UTC (rev 241570)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: arjan5 <aur at anymore.nl>
+
+pkgname=jpeg-archive
+pkgver=2.1.1
+pkgrel=1
+pkgdesc='Utilities for archiving JPEGs for long term storage'
+arch=(x86_64 i686)
+url="https://github.com/danielgtaylor/jpeg-archive/"
+license=(MIT)
+depends=(bash)
+makedepends=(git nasm)
+_commit=fc331be551a734372437fb71bdf1e595e6b5724c # 2.1.1
+_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)
+md5sums=('SKIP'
+         'SKIP'
+         'fee4531e218dc868ccfa5f7a1ab03e48')
+
+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"
+
+  cd "$srcdir/mozjpeg"
+  autoreconf -fiv
+}
+
+build() {
+  cd "$srcdir/mozjpeg"
+  ./configure --with-jpeg8 --prefix="$srcdir/jpeg-archive/mozjpeg"
+  make
+  make install
+
+  cd "$srcdir/jpeg-archive"
+  MOZJPEG_PREFIX="$srcdir/jpeg-archive/mozjpeg" make
+}
+
+package() {
+  cd "$srcdir/jpeg-archive"
+  make PREFIX="$pkgdir/usr" install
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  tail -n7 README.md > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}