JPEG 8 minimal, to match up to native PKGBUILD

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8aa7951cfb7..de8de153adb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-libjpeg-turbo
 	pkgdesc = JPEG image codec with accelerated baseline compression and decompression (mingw-w64)
 	pkgver = 1.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://libjpeg-turbo.virtualgl.org
 	arch = any
 	license = custom
@@ -11,6 +11,7 @@ pkgbase = mingw-w64-libjpeg-turbo
 	depends = mingw-w64-crt
 	provides = mingw-w64-libjpeg
 	conflicts = mingw-w64-libjpeg
+	conflicts = mingw-w64-libjpeg6-turbo
 	options = staticlibs
 	options = !strip
 	options = !buildflags
diff --git a/PKGBUILD b/PKGBUILD
index eca6499e056e..9a221f362bf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=mingw-w64-libjpeg-turbo
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 arch=(any)
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)"
 license=("custom" "GPL")
 depends=(mingw-w64-crt)
 makedepends=(nasm mingw-w64-cmake)
 provides=(mingw-w64-libjpeg)
-conflicts=(mingw-w64-libjpeg)
+conflicts=(mingw-w64-libjpeg mingw-w64-libjpeg6-turbo)
 options=(staticlibs !strip !buildflags)
 url="http://libjpeg-turbo.virtualgl.org"
 source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz"
@@ -32,6 +32,7 @@ build() {
     mkdir "build-${_arch}" && pushd "build-${_arch}"
     ${_arch}-cmake \
       -DCMAKE_BUILD_TYPE=Release \
+      -DWITH_JPEG8=ON \
       ..
     make
     popd