MuPDF: point to latest version.

* We were building a very outdated one.
* Rename 'fitz' to 'mupdf', since even the lib now uses that name
* Remove invalid "lib" provide as there is only a static library.
This commit is contained in:
Adrien Destugues
2014-10-07 20:43:25 +02:00
parent 01bb9b9cde
commit 79e0f0bafd
4 changed files with 783 additions and 78 deletions

View File

@@ -1,73 +0,0 @@
SUMMARY="A PDF library that is part of MuPDF"
DESCRIPTION="
Fitz is a library that is part of MuPDF. The renderer in MuPDF is tailored for \
high quality anti-aliased graphics. It renders text with metrics and spacing \
accurate to within fractions of a pixel for the highest fidelity in \
reproducing the look of a printed page on screen.
"
HOMEPAGE="http://code.google.com/p/mupdf/"
LICENSE="GNU GPL v3"
COPYRIGHT="2007 Free Software Foundation, Inc."
SRC_URI="http://mupdf.googlecode.com/files/mupdf-1.1-source.tar.gz"
SOURCE_DIR="mupdf-1.1-source"
PATCHES="fitz-1.1.patchset"
CHECKSUM_SHA256="e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
fitz$secondaryArchSuffix = $portVersion compat >= 1.1
lib:libfitz = $portVersion compat >= 1.1
devel:libfitz$secondaryArchSuffix = $portVersion compat >= 1.1
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libjpeg$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libopenjpeg$secondaryArchSuffix
lib:libjbig2dec$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libopenjpeg$secondaryArchSuffix
devel:libjbig2dec$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:freetype_config$secondaryArchSuffix
"
BUILD()
{
make $jobArgs libs
}
INSTALL()
{
make install-libs \
prefix=$prefix \
bindir=$binDir \
libdir=$libDir \
incdir=$includeDir \
mandir=$manDir
prepareInstalledDevelLibs libfitz
}

View File

@@ -1,59 +0,0 @@
From c73c0e94e09951778bd8a47d49081cc6e877449d Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 18 Nov 2013 01:10:58 -0700
Subject: Remove libm and add install-libs target
diff --git a/Makefile b/Makefile
index 05bb4e8..74319f7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ default: all
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line.
CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts
-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
+LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz
include Makerules
include Makethird
@@ -171,6 +171,11 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(bindir)
install $(wildcard apps/man/*.1) $(mandir)/man1
+install-libs: $(FITZ_LIB)
+ install -d $(libdir) $(incdir)
+ install $(FITZ_LIB) $(libdir)
+ install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir)
+
# --- Clean and Default ---
all: all-nojs
--
1.8.3.4
From a83d38747879328a1ff32773af0c3005f3265346 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 24 Sep 2014 13:25:59 +0200
Subject: Add Haiku support.
diff --git a/Makerules b/Makerules
index 3e036f6..96feb65 100644
--- a/Makerules
+++ b/Makerules
@@ -23,6 +23,10 @@ else
$(error unknown build setting: '$(build)')
endif
+ifeq "$(OS)" "Haiku"
+SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+endif
+
ifeq "$(OS)" "Linux"
SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
X11_LIBS := -lX11 -lXext
--
1.8.3.4