summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-03-14 17:03:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:17:43 +0000
commitae2c5f24771b333f3419aeacae4d2e16daf7badd (patch)
tree03f5e5d85ae6c4ca2034c5581f5bf075d52569a2
parente42e6959516e7b10afcb4aad9eb8b944016420ef (diff)
downloadpoky-ae2c5f24771b333f3419aeacae4d2e16daf7badd.tar.gz
ghostscript: update to 9.05
Update ghostscript to 9.05, and update ghostscript-9.02-genarch.patch at same time because it can't be applied. Add patch ghostscript/ghostscript-9.05-NOT-check-endian.patch to forbid checking endianese. (From OE-Core rev: 7e7bdb9dc4ca61f8427f07f2ff220767385085c5) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch12
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch54
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.05.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.04.bb)9
3 files changed, 65 insertions, 10 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
index 3c2a4c82dd..c18246cdb8 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
@@ -14,14 +14,14 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
14diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak 14diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak
15--- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800 15--- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800
16+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800 16+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800
17@@ -50,8 +50,8 @@ 17@@ -66,8 +66,8 @@
18 stdpre_h=$(GLSRC)stdpre.h $(stdpn_h) 18 stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
19 stdint__h=$(GLSRC)stdint_.h $(std_h) 19 stdint__h=$(GLSRC)stdint_.h $(std_h)
20 20
21-$(GLGEN)arch.h : $(GENARCH_XE) 21-$(GLGEN)arch.h : $(GENARCH_XE)
22- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h 22- $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
23+##$(GLGEN)arch.h : $(GENARCH_XE) 23+##$(GLGEN)arch.h : $(GENARCH_XE)
24+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h 24+## $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
25 25
26 # Platform interfaces 26 # Platform interfaces
27 27
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
new file mode 100644
index 0000000000..52353b50d5
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
@@ -0,0 +1,54 @@
1configure will check endianness of build machine. When cross compile it fails.
2So remove the check for Yocto.
3
4Upstream-Status: Pending
5
6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7
8--- ghostscript-9.05/configure.ac.orig 2012-03-14 15:28:30.828956872 +0800
9+++ ghostscript-9.05/configure.ac 2012-03-14 15:29:05.060957357 +0800
10@@ -1739,25 +1739,25 @@
11 dnl check for big/little endian for LCMS
12 dnl --------------------------------------------------
13
14-AC_MSG_CHECKING([for big endian])
15-
16-AC_RUN_IFELSE(
17- [AC_LANG_PROGRAM([#include <stdio.h>], [
18- static const int one = 1;
19- return (*(char*)&one == 0 ? 0 : 1);
20- ])],
21- [LCMS_BIGENDIAN=1],
22- [LCMS_BIGENDIAN=0])
23-
24-if test "x$LCMS_BIGENDIAN" != "x0"; then
25- LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
26- LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
27- AC_MSG_RESULT(yes)
28-else
29- LCMS_ENDIAN=
30- LCMS2_ENDIAN=
31- AC_MSG_RESULT(no)
32-fi
33+dnl AC_MSG_CHECKING([for big endian])
34+dnl
35+dnl AC_RUN_IFELSE(
36+dnl [AC_LANG_PROGRAM([#include <stdio.h>], [
37+dnl static const int one = 1;
38+dnl return (*(char*)&one == 0 ? 0 : 1);
39+dnl ])],
40+dnl [LCMS_BIGENDIAN=1],
41+dnl [LCMS_BIGENDIAN=0])
42+dnl
43+dnl if test "x$LCMS_BIGENDIAN" != "x0"; then
44+dnl LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
45+dnl LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
46+dnl AC_MSG_RESULT(yes)
47+dnl else
48+dnl LCMS_ENDIAN=
49+dnl LCMS2_ENDIAN=
50+dnl AC_MSG_RESULT(no)
51+dnl fi
52
53
54 AC_SUBST(LCMS_ENDIAN)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
index 3f9d7b5cb9..6c1d1a927e 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
@@ -13,9 +13,9 @@ HOMEPAGE = "http://www.ghostscript.com"
13SECTION = "console/utils" 13SECTION = "console/utils"
14 14
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
17 17
18PR = "r3" 18PR = "r0"
19 19
20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_virtclass-native = "" 21DEPENDS_virtclass-native = ""
@@ -27,12 +27,13 @@ SRC_URI = "${SRC_URI_BASE} \
27 file://ghostscript-9.02-genarch.patch \ 27 file://ghostscript-9.02-genarch.patch \
28 file://objarch.h \ 28 file://objarch.h \
29 file://ghostscript-9.02-parallel-make.patch \ 29 file://ghostscript-9.02-parallel-make.patch \
30 file://ghostscript-9.05-NOT-check-endian.patch \
30 " 31 "
31 32
32SRC_URI_virtclass-native = "${SRC_URI_BASE}" 33SRC_URI_virtclass-native = "${SRC_URI_BASE}"
33 34
34SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a" 35SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1"
35SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4" 36SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207"
36 37
37EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ 38EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \
38 --with-fontpath=${datadir}/fonts --with-install-cups" 39 --with-fontpath=${datadir}/fonts --with-install-cups"