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

[Gaëtan Bisson]

    Date: Tuesday, September 4, 2018 @ 07:49:37
  Author: bisson
Revision: 333247

db-move: moved libjpeg-turbo from [testing] to [extra] (x86_64)

Added:
  libjpeg-turbo/repos/extra-x86_64/PKGBUILD
    (from rev 333246, libjpeg-turbo/repos/testing-x86_64/PKGBUILD)
Deleted:
  libjpeg-turbo/repos/extra-x86_64/PKGBUILD
  libjpeg-turbo/repos/testing-x86_64/

-----------------------+
 /PKGBUILD             |   55 +++++++++++++++++++++++++++++++++++++++++++
 extra-x86_64/PKGBUILD |   61 ------------------------------------------------
 2 files changed, 55 insertions(+), 61 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2018-09-04 07:49:11 UTC (rev 333246)
+++ extra-x86_64/PKGBUILD	2018-09-04 07:49:37 UTC (rev 333247)
@@ -1,61 +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.5.3
-pkgrel=1
-pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
-url='https://libjpeg-turbo.org/'
-arch=('x86_64')
-license=('custom')
-makedepends=('nasm' 'jdk8-openjdk')
-validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16')
-source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523'
-            'SKIP')
-
-provides=('libjpeg=8.1.2' 'turbojpeg')
-conflicts=('libjpeg' 'turbojpeg')
-replaces=('libjpeg' 'turbojpeg')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's/Szathmáry/Szathmary/g' -i java/org/libjpegturbo/turbojpeg/*.java
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# make the build reproducible
-	_build=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d)
-
-	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 \
-		--with-build-date=$_build \
-
-	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/${pkgname}"
-	ln -s ../../doc/libjpeg-turbo/LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}"
-	install -m 644 jpegint.h "${pkgdir}/usr/include" # required by other software
-}

Copied: libjpeg-turbo/repos/extra-x86_64/PKGBUILD (from rev 333246, libjpeg-turbo/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2018-09-04 07:49:37 UTC (rev 333247)
@@ -0,0 +1,55 @@
+# $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=2.0.0
+pkgrel=1
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='https://libjpeg-turbo.org/'
+arch=('x86_64')
+license=('custom')
+makedepends=('cmake' 'nasm' 'jdk8-openjdk')
+validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16')
+source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha256sums=('778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868'
+            'SKIP')
+
+provides=('libjpeg=8.2.2')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/Szathmáry/Szathmary/g' -i java/org/libjpegturbo/turbojpeg/*.java
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	cmake \
+		-DWITH_JAVA=1 \
+		-DWITH_JPEG8=1 \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		.
+
+	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/${pkgname}"
+	ln -s ../../doc/libjpeg-turbo/LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}"
+	install -m 644 jpegint.h "${pkgdir}/usr/include" # required by other software
+}