[arch-commits] Commit in libjpeg-turbo/repos (4 files)

[Gaetan Bisson]

    Date: Saturday, December 5, 2015 @ 23:08:46
  Author: bisson
Revision: 252526

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

Added:
  libjpeg-turbo/repos/extra-i686/PKGBUILD
    (from rev 252525, libjpeg-turbo/trunk/PKGBUILD)
  libjpeg-turbo/repos/extra-x86_64/PKGBUILD
    (from rev 252525, libjpeg-turbo/trunk/PKGBUILD)
Deleted:
  libjpeg-turbo/repos/extra-i686/PKGBUILD
  libjpeg-turbo/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |  102 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   43 --------------------
 extra-x86_64/PKGBUILD |   43 --------------------
 3 files changed, 102 insertions(+), 86 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-12-05 22:08:16 UTC (rev 252525)
+++ extra-i686/PKGBUILD	2015-12-05 22:08:46 UTC (rev 252526)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
-
-pkgname=libjpeg-turbo
-pkgver=1.4.2
-pkgrel=1
-pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
-url='http://libjpeg-turbo.virtualgl.org/'
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('nasm')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2666158ccd5318513f875867bbc4af52f6eb9f0b')
-
-provides=('libjpeg=8.0.2' 'turbojpeg')
-conflicts=('libjpeg' 'turbojpeg')
-replaces=('libjpeg' 'turbojpeg')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make test
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="${pkgdir}" \
-		docdir="/usr/share/doc/${pkgname}" \
-		exampledir="/usr/share/doc/${pkgname}" \
-		install
-	
-	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
-	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
-	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
-}

Copied: libjpeg-turbo/repos/extra-i686/PKGBUILD (from rev 252525, libjpeg-turbo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-12-05 22:08:46 UTC (rev 252526)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
+
+pkgname=libjpeg-turbo
+pkgver=1.4.2
+pkgrel=2
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
+arch=('i686' 'x86_64')
+license=('custom')
+makedepends=('nasm' 'jdk8-openjdk')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('2666158ccd5318513f875867bbc4af52f6eb9f0b')
+
+provides=('libjpeg=8.0.2' 'turbojpeg')
+conflicts=('libjpeg' 'turbojpeg')
+replaces=('libjpeg' 'turbojpeg')
+
+options=('!makeflags')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export JNI_CFLAGS='-I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux'
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-jpeg8 \
+		--with-java \
+
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make test
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		DESTDIR="${pkgdir}" \
+		docdir="/usr/share/doc/${pkgname}" \
+		exampledir="/usr/share/doc/${pkgname}" \
+		install
+	
+	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
+	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-12-05 22:08:16 UTC (rev 252525)
+++ extra-x86_64/PKGBUILD	2015-12-05 22:08:46 UTC (rev 252526)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
-
-pkgname=libjpeg-turbo
-pkgver=1.4.2
-pkgrel=1
-pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
-url='http://libjpeg-turbo.virtualgl.org/'
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('nasm')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2666158ccd5318513f875867bbc4af52f6eb9f0b')
-
-provides=('libjpeg=8.0.2' 'turbojpeg')
-conflicts=('libjpeg' 'turbojpeg')
-replaces=('libjpeg' 'turbojpeg')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make test
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="${pkgdir}" \
-		docdir="/usr/share/doc/${pkgname}" \
-		exampledir="/usr/share/doc/${pkgname}" \
-		install
-	
-	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
-	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
-	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
-}

Copied: libjpeg-turbo/repos/extra-x86_64/PKGBUILD (from rev 252525, libjpeg-turbo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-12-05 22:08:46 UTC (rev 252526)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
+
+pkgname=libjpeg-turbo
+pkgver=1.4.2
+pkgrel=2
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
+arch=('i686' 'x86_64')
+license=('custom')
+makedepends=('nasm' 'jdk8-openjdk')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('2666158ccd5318513f875867bbc4af52f6eb9f0b')
+
+provides=('libjpeg=8.0.2' 'turbojpeg')
+conflicts=('libjpeg' 'turbojpeg')
+replaces=('libjpeg' 'turbojpeg')
+
+options=('!makeflags')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export JNI_CFLAGS='-I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux'
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-jpeg8 \
+		--with-java \
+
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make test
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		DESTDIR="${pkgdir}" \
+		docdir="/usr/share/doc/${pkgname}" \
+		exampledir="/usr/share/doc/${pkgname}" \
+		install
+	
+	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
+	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
+}