summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaetan Bisson2016-10-05 13:50:15 -1000
committerGaetan Bisson2016-10-05 13:50:15 -1000
commit848a7f11828b74791bad4cb72c85f9c029e4d229 (patch)
tree0e7fb0251bb06b180c003a7ed2c3ec5fbd133397
parent8eb0732d9d703a20dc4cdd7cfffd5e6eb6686106 (diff)
downloadaur-848a7f11828b74791bad4cb72c85f9c029e4d229.tar.gz
upstream update, switch to system openjpeg2
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
2 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 76e44580868..af75106a891 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mupdf-git
pkgdesc = Lightweight PDF, XPS and CBZ viewer
- pkgver = 20160709.67af3ff
+ pkgver = 20161005.87524fa
pkgrel = 1
url = http://mupdf.com/
arch = i686
@@ -11,8 +11,9 @@ pkgbase = mupdf-git
depends = curl
depends = freetype2
depends = jbig2dec
- depends = libjpeg
+ depends = libjpeg-turbo
depends = libxext
+ depends = openjpeg2
provides = mupdf
conflicts = mupdf
source = git://git.ghostscript.com/mupdf.git
diff --git a/PKGBUILD b/PKGBUILD
index a83563a9f51..55aa8b69f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
pkgname=mupdf-git
_pkgname=mupdf
-pkgver=20160709.67af3ff
+pkgver=20161005.87524fa
pkgrel=1
pkgdesc='Lightweight PDF, XPS and CBZ viewer'
arch=('i686' 'x86_64' 'armv7h')
url='http://mupdf.com/'
license=('AGPL3')
makedepends=('git')
-depends=('curl' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext')
+depends=('curl' 'freetype2' 'jbig2dec' 'libjpeg-turbo' 'libxext' 'openjpeg2')
source=('git://git.ghostscript.com/mupdf.git'
'desktop')
sha1sums=('SKIP'
@@ -29,12 +29,11 @@ prepare() {
cd "${srcdir}/${_pkgname}"
git submodule update --init thirdparty/mujs
- git submodule update --init thirdparty/openjpeg
- # fix memento.h confusion
- sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
+ # link against system libopenjp2 dynamically
+ sed '/#define OPJ_STATIC/d' -i source/fitz/load-jpx.c
- # embedding a CJK font into each binary is madness...
+ # embedding CJK fonts into binaries is madness...
sed '/TOFU_CJK /c #define TOFU_CJK 1/' -i include/mupdf/fitz/config.h
}
@@ -54,6 +53,6 @@ package() {
install -Dm644 ../desktop "${pkgdir}"/usr/share/applications/mupdf.desktop
find "${pkgdir}"/usr/share -type f -exec chmod 0644 {} +
- # prevent the static-linking madness from spreading...
+ # prevent the static-linking disease from spreading...
rm -fr "${pkgdir}"/usr/{include,lib}
}