From be484b3420e396f8b59e216fdbcb02cf50abc642 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 10 Mar 2019 06:00:11 +0000
Subject: user/libjpeg-turbo: bump to 2.0.2, modernise, ->CMake

---
 user/libjpeg-turbo/APKBUILD | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

(limited to 'user/libjpeg-turbo')

diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD
index 12d5af767..36cbbbf7c 100644
--- a/user/libjpeg-turbo/APKBUILD
+++ b/user/libjpeg-turbo/APKBUILD
@@ -1,15 +1,14 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libjpeg-turbo
-pkgver=1.5.3
-pkgrel=2
+pkgver=2.0.2
+pkgrel=0
 pkgdesc="Accelerated JPEG compression and decompression library"
 url="https://libjpeg-turbo.org/"
 arch="all"
 license="IJG AND BSD-3-Clause AND Zlib"
 depends=""
 makedepends=""
-replaces="libjpeg"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-utils"
 source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz"
 
@@ -18,28 +17,25 @@ pmmx | x86 | x86_64)	makedepends="$makedepends nasm" ;;
 esac
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-jpeg8
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
 	make
 }
 
 check() {
-	cd "$builddir"
-	make test
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname \
-		install
+	make DESTDIR="$pkgdir" install
 }
 
 utils() {
@@ -49,14 +45,4 @@ utils() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-doc() {
-	default_doc
-	replaces="jpeg-doc"
-}
-
-dev() {
-	default_dev
-	replaces="jpeg-dev"
-}
-
-sha512sums="b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202  libjpeg-turbo-1.5.3.tar.gz"
+sha512sums="204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08  libjpeg-turbo-2.0.2.tar.gz"
-- 
cgit v1.2.3-70-g09d2