[arch-commits] Commit in mupdf/trunk (PKGBUILD)

[Christian Hesse]

    Date: Saturday, April 23, 2016 @ 19:47:16
  Author: eworm
Revision: 171637

use system glfw and harfbuzz

Modified:
  mupdf/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-23 17:17:30 UTC (rev 171636)
+++ PKGBUILD	2016-04-23 17:47:16 UTC (rev 171637)
@@ -15,7 +15,7 @@
 license=('AGPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
          'openssl' 'openjpeg2' 'mesa' 'libgl' 'libxcursor' 'libxrandr'
-	 'libxinerama')
+	 'libxinerama' 'harfbuzz' 'glfw')
 makedepends=('mesa-libgl')
 install=mupdf.install
 # we need static libs for zathura-pdf-mupdf
@@ -31,7 +31,10 @@
 
 prepare() {
   cd $pkgname-${pkgver/_/}-source
-  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
   patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
 
   sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
@@ -40,9 +43,15 @@
 build() {
   CFLAGS+=' -fPIC'
   CXXFLAGS+=' -fPIC'
+  export CFLAGS CXXFLAGS
 
+  HAVE_GLFW='yes'
+  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
+  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
+  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
+
   cd $pkgname-${pkgver/_/}-source
-  make build=release CURL_LIBS='-lcurl -lpthread'
+  make build=release
 }
 
 package() {