summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2010-06-05 15:35:09 +0000
committerMichael Weber <xmw@gentoo.org>2010-06-05 15:35:09 +0000
commit9f2bcd3959b52d5354e3fe60e4d42ab206fd52ad (patch)
treed3c1d431b5caa5dbd5eafa9d482f1baae3d84cf4 /app-text/mupdf/files
parentRestore gcam. Masked for removal in 30days. Bug #231227 (diff)
downloadsunrise-9f2bcd3959b52d5354e3fe60e4d42ab206fd52ad.tar.gz
sunrise-9f2bcd3959b52d5354e3fe60e4d42ab206fd52ad.tar.bz2
sunrise-9f2bcd3959b52d5354e3fe60e4d42ab206fd52ad.zip
app-text/mupdf: Version bump, cleaned up the CFLAGS situation in the build system.
svn path=/sunrise/; revision=10659
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r--app-text/mupdf/files/mupdf-0.6-buildsystem.patch51
-rw-r--r--app-text/mupdf/files/mupdf-1170-buildsystem.patch44
2 files changed, 51 insertions, 44 deletions
diff --git a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
new file mode 100644
index 000000000..56086726e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
@@ -0,0 +1,51 @@
+Michael Weber Jun 5th 2010
+ Possibility to pass /usr/lib64 on multilib/64bit systems.
+ Dropped the hard compiler options for compartibility on older chips.
+
+--- Makefile 2010-06-05 16:38:48.000000000 +0200
++++ Makefile 2010-06-05 16:41:43.000000000 +0200
+@@ -7,6 +7,7 @@
+
+ build ?= debug
+ prefix ?= /usr/local
++libprefix ?= $(prefix)/lib
+
+ OBJDIR := build/$(build)
+ GENDIR := build/generated
+@@ -314,8 +315,8 @@
+ rm -rf build
+
+ install: $(DIRS) $(APPS) $(MUPDF_LIB)
+- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
++ install -d $(prefix)/bin $(libprefix) $(prefix)/include
+ install $(APPS) $(prefix)/bin
+- install $(MUPDF_LIB) $(prefix)/lib
++ install $(MUPDF_LIB) $(libprefix)
+ install $(MUPDF_HDR) $(prefix)/include
+
+--- Makerules 2010-06-05 16:38:48.000000000 +0200
++++ Makerules 2010-06-05 16:49:44.000000000 +0200
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+
+ LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
+-CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
+-LDFLAGS =
++CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
++LDFLAGS +=
+ CC = cc
+ LD = $(CC)
+ AR = ar
+@@ -23,10 +23,10 @@
+ CFLAGS += `pkg-config --cflags freetype2`
+ LDFLAGS += `pkg-config --libs freetype2`
+ endif
+-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
++CFLAGS +=
+ ARCH_SRC = archx86.c
+ endif
+ endif
diff --git a/app-text/mupdf/files/mupdf-1170-buildsystem.patch b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
deleted file mode 100644
index 76a19dbbc..000000000
--- a/app-text/mupdf/files/mupdf-1170-buildsystem.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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