summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2010-06-02 01:05:51 +0000
committerMichael Weber <xmw@gentoo.org>2010-06-02 01:05:51 +0000
commit57921ed94239c6cc84d760189328882b651ef5a4 (patch)
tree5070c2c79f98b2a98a67ce5d507c3435210293f9 /app-text/mupdf/files
parentmedia-libs/jbig2dec: Tested on ~x86, keyword added (diff)
downloadsunrise-57921ed94239c6cc84d760189328882b651ef5a4.tar.gz
sunrise-57921ed94239c6cc84d760189328882b651ef5a4.tar.bz2
sunrise-57921ed94239c6cc84d760189328882b651ef5a4.zip
app-text/mupdf: Version bump. ftjam build system replaced by Makefile
svn path=/sunrise/; revision=10633
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r--app-text/mupdf/files/mupdf-1170-buildsystem.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/app-text/mupdf/files/mupdf-1170-buildsystem.patch b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
new file mode 100644
index 000000000..76a19dbbc
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
@@ -0,0 +1,44 @@
+--- Makefile.old 2010-05-27 19:22:34.000000000 +0200
++++ Makefile 2010-05-29 19:24:55.000000000 +0200
+@@ -7,6 +7,7 @@
+
+ build ?= debug
+ prefix ?= /usr/local
++libprefix ?= $(prefix)/lib
+
+ OBJDIR := build/$(build)
+ GENDIR := build/generated
+@@ -301,7 +302,8 @@
+ rm -rf build
+
+ install: $(DIRS) $(APPS) $(MUPDF_LIB)
+- install $(APPS) $(prefix)/bin
+- install $(MUPDF_LIB) $(prefix)/lib
+- install $(MUPDF_HDR) $(prefix)/include
++ install -d $(prefix)/bin $(libprefix) $(prefix)/include
++ install $(APPS) -t $(prefix)/bin
++ install $(MUPDF_LIB) -t $(libprefix)
++ install $(MUPDF_HDR) -t $(prefix)/include
+
+--- Makerules.old 2010-05-20 18:37:16.000000000 +0200
++++ Makerules 2010-05-29 19:29:49.000000000 +0200
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+
+ LIBS := -ljbig2dec -lopenjpeg -lfreetype -ljpeg -lz -lm
+-CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf
+-LDFLAGS =
++CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf
++LDFLAGS +=
+ CC = cc
+ LD = $(CC)
+ AR = ar
+@@ -21,7 +21,7 @@
+ ifeq "$(OS)" "Linux"
+ CFLAGS += `pkg-config --cflags freetype2`
+ LDFLAGS += `pkg-config --libs freetype2`
+-X11LIBS = -lX11 -lXext
++X11LIBS += `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ ifeq "$(build)" "release"
+ CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86