summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchala2016-09-28 16:01:45 -0700
committerSchala2016-09-28 16:01:45 -0700
commitb94b63fe8fbcd9897c76ef330989e62e8a322732 (patch)
treef7da2d1d985d77f7b18693bc6e0843583e6a5eeb
parent664639d0b3dc2f7fdd1ff0f5a01889f29217789d (diff)
downloadaur-b94b63fe8fbcd9897c76ef330989e62e8a322732.tar.gz
doc dir fix
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD18
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68ed18d09f47..87202a42f82c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
# Generated by mksrcinfo v8
-# Thu Sep 22 08:44:44 UTC 2016
+# Wed Sep 28 23:00:54 UTC 2016
pkgbase = mingw-w64-libjpeg-turbo
pkgdesc = JPEG image codec with accelerated baseline compression and decompression (mingw-w64)
pkgver = 1.5.1
- pkgrel = 1
+ pkgrel = 2
url = http://libjpeg-turbo.virtualgl.org
arch = any
license = custom
license = GPL
makedepends = nasm
- makedepends = mingw-w64-cmake
+ makedepends = mingw-w64-configure
depends = mingw-w64-crt
depends = libjpeg-turbo
provides = mingw-w64-libjpeg
diff --git a/PKGBUILD b/PKGBUILD
index 087e28874d1d..24effb1e5280 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
pkgname=mingw-w64-libjpeg-turbo
pkgver=1.5.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 libjpeg-turbo)
-makedepends=(nasm mingw-w64-cmake)
+makedepends=(nasm mingw-w64-configure)
provides=(mingw-w64-libjpeg)
conflicts=(mingw-w64-libjpeg mingw-w64-libjpeg6-turbo)
options=(staticlibs !strip !buildflags)
@@ -30,10 +30,8 @@ build() {
for _arch in ${_architectures}; do
unset LDFLAGS
mkdir "build-${_arch}" && pushd "build-${_arch}"
- ${_arch}-cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_JPEG8=ON \
- ..
+ ${_arch}-configure \
+ --with-jpeg8
make
popd
done
@@ -42,9 +40,13 @@ build() {
package() {
for _arch in ${_architectures}; do
cd "${srcdir}/${pkgname#mingw-w64-}-$pkgver/build-${_arch}"
- make DESTDIR="$pkgdir" install
+ make \
+ DESTDIR="$pkgdir" \
+ docdir="/usr/${_arch}/share/doc/libjpeg-turbo" \
+ exampledir="/usr/${_arch}/share/doc/libjpeg-turbo" \
+ install
+ cp "${srcdir}"/libjpeg-turbo-${pkgver}/{jinclude,transupp}.h ${pkgdir}/usr/${_arch}/include/
ln -s /usr/include/jpegint.h "$pkgdir/usr/${_arch}/include/jpegint.h"
- rm -r "$pkgdir/usr/${_arch}/doc"
find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g