summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.AURINFO18
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD74
3 files changed, 58 insertions, 61 deletions
diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index ccdab45bb572..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgbase = mozjpeg-git
- pkgdesc = A fork of libjpeg-turbo with jpgcrush built in.
- pkgver = 20131001
- pkgrel = 1
- url = https://github.com/mozilla/mozjpeg/
- arch = i686
- arch = x86_64
- license = GPL
- makedepends = git
- makedepends = nasm
- provides = libjpeg=8.0.2
- provides = turbojpeg
- provides = libjpeg-turbo
- conflicts = libjpeg-turbo
- source = git+https://github.com/mozilla/mozjpeg.git
-
-pkgname = mozjpeg-git
-
diff --git a/.SRCINFO b/.SRCINFO
index 8d79d38e454b..59b5df6185ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,26 @@
pkgbase = mozjpeg-git
- pkgdesc = A fork of libjpeg-turbo with jpgcrush built in.
- pkgver = 20131001
+ pkgdesc = Improved JPEG encoder
+ pkgver = 4.0.3.r198.g5552483d
pkgrel = 1
- url = https://github.com/mozilla/mozjpeg/
- arch = i686
+ url = https://github.com/mozilla/mozjpeg
arch = x86_64
- license = GPL
+ license = BSD
makedepends = git
+ makedepends = cmake
makedepends = nasm
- provides = libjpeg=8.0.2
- provides = turbojpeg
+ makedepends = java-environment>11
+ depends = glibc
+ depends = libpng
+ optdepends = java-runtime>11: for TurboJPEG Java wrapper
+ provides = libjpeg
+ provides = libjpeg.so
+ provides = libturbojpeg.so
provides = libjpeg-turbo
+ provides = mozjpeg
+ conflicts = libjpeg
+ conflicts = mozjpeg
conflicts = libjpeg-turbo
- source = git+https://github.com/mozilla/mozjpeg.git
- md5sums = SKIP
+ source = git+https://github.com/mozilla/mozjpeg
+ sha512sums = SKIP
pkgname = mozjpeg-git
-
diff --git a/PKGBUILD b/PKGBUILD
index aade07e942d4..c5f2b6511d97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,51 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer: MGislv <nocentinigabriele91@gmail.com>
+# Contributor: Kyle Keen <keenerd@gmail.com>
+
pkgname=mozjpeg-git
-pkgver=20131001
+pkgver=4.0.3.r198.g5552483d
pkgrel=1
-pkgdesc="A fork of libjpeg-turbo with jpgcrush built in."
-url="https://github.com/mozilla/mozjpeg/"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('git' 'nasm')
-depends=()
-source=('git+https://github.com/mozilla/mozjpeg.git')
-md5sums=('SKIP')
-_gitname=mozjpeg
-
-provides=('libjpeg=8.0.2' 'turbojpeg' 'libjpeg-turbo')
-conflicts=('libjpeg-turbo')
+pkgdesc='Improved JPEG encoder'
+url='https://github.com/mozilla/mozjpeg'
+arch=('x86_64')
+license=('BSD')
+depends=('glibc' 'libpng')
+makedepends=('git' 'cmake' 'nasm' 'java-environment>11')
+optdepends=('java-runtime>11: for TurboJPEG Java wrapper')
+provides=('libjpeg' 'libjpeg.so' 'libturbojpeg.so' 'libjpeg-turbo' 'mozjpeg')
+conflicts=('libjpeg' 'mozjpeg' 'libjpeg-turbo')
+source=("git+${url}")
+sha512sums=('SKIP')
pkgver() {
- cd "$_gitname"
- git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//'
+ cd mozjpeg
+ git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-build()
-{
- cd "$_gitname"
- autoreconf -fiv
- ./configure --prefix=/usr --mandir=/usr/share/man
+build() {
+ cd mozjpeg
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_BUILD_TYPE=None \
+ -DWITH_JAVA=ON \
+ -DWITH_JPEG8=ON \
+ -DENABLE_SHARED=1 \
+ -DENABLE_STATIC=0 \
+ -W no-dev \
+ -B build \
+ -S .
+ make -C build
}
-# takes forever
-#check()
-#{
-# cd "$_gitname"
-# make test
-#}
-
package() {
- cd "$_gitname"
- make DESTDIR="$pkgdir" docdir="/usr/share/doc/$pkgname" install
- # license?
- install -m644 jpegint.h "$pkgdir/usr/include"
+ cd mozjpeg
+ make DESTDIR="${pkgdir}" \
+ docdir='/usr/share/doc/mozjpeg' \
+ exampledir='/usr/share/doc/mozjpeg' \
+ install -C build
+
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}"
+ # header required by some dependants
+ # https://bugs.archlinux.org/task/24787
+ install -m 644 jpegint.h "${pkgdir}/usr/include"
}
-