From 238eda7cc08b1832d1ac3237bdde931301f4c14e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 1 Apr 2015 17:19:32 +0300 Subject: [PATCH] mupdf: disable builtin libjpeg --- app-text/mupdf/mupdf-1.6.recipe | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app-text/mupdf/mupdf-1.6.recipe b/app-text/mupdf/mupdf-1.6.recipe index 54f60d8bf..846936ca9 100644 --- a/app-text/mupdf/mupdf-1.6.recipe +++ b/app-text/mupdf/mupdf-1.6.recipe @@ -17,7 +17,7 @@ SOURCE_DIR="mupdf-$portVersion-source" CHECKSUM_SHA256="9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563" PATCHES="mupdf-1.6.patchset" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -27,17 +27,17 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libz$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix - openjpeg$secondaryArchSuffix lib:libjbig2dec$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libopenjp2$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" + devel:libfreetype$secondaryArchSuffix devel:libopenjp2$secondaryArchSuffix devel:libjbig2dec$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -51,6 +51,8 @@ BUILD_PREREQUIRES=" BUILD() { + # don't use builtin libjpeg + rm -rf thirdparty/jpeg scripts/jpeg make build=release $jobArgs libs }