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>
 diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak
 --- ghostscript-8.64.orig/base/lib.mak  2010-02-10 10:30:02.000000000 +0800
 +++ ghostscript-8.64/base/lib.mak       2010-02-10 10:56:21.000000000 +0800
-@@ -50,8 +50,8 @@
+@@ -66,8 +66,8 @@
  stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
  stdint__h=$(GLSRC)stdint_.h $(std_h)
-
+ 
 -$(GLGEN)arch.h : $(GENARCH_XE)
--       $(EXP)$(GENARCH_XE) $(GLGEN)arch.h
+-       $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
 +##$(GLGEN)arch.h : $(GENARCH_XE)
-+##     $(EXP)$(GENARCH_XE) $(GLGEN)arch.h
-
++##     $(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
+ 
  # Platform interfaces
-
+ 
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 @@
+configure will check endianness of build machine. When cross compile it fails.
+So remove the check for Yocto.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+
+--- ghostscript-9.05/configure.ac.orig  2012-03-14 15:28:30.828956872 +0800
++++ ghostscript-9.05/configure.ac       2012-03-14 15:29:05.060957357 +0800
+@@ -1739,25 +1739,25 @@
+ dnl check for big/little endian for LCMS
+ dnl --------------------------------------------------
+ 
+-AC_MSG_CHECKING([for big endian])
+-
+-AC_RUN_IFELSE(
+-  [AC_LANG_PROGRAM([#include <stdio.h>], [
+-   static const int one = 1;
+-   return (*(char*)&one == 0 ? 0 : 1);
+-  ])],
+-  [LCMS_BIGENDIAN=1],
+-  [LCMS_BIGENDIAN=0])
+-
+-if test "x$LCMS_BIGENDIAN" != "x0"; then
+-  LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
+-  LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
+-  AC_MSG_RESULT(yes)
+-else
+-  LCMS_ENDIAN=
+-  LCMS2_ENDIAN=
+-  AC_MSG_RESULT(no)
+-fi
++dnl AC_MSG_CHECKING([for big endian])
++dnl 
++dnl AC_RUN_IFELSE(
++dnl   [AC_LANG_PROGRAM([#include <stdio.h>], [
++dnl    static const int one = 1;
++dnl    return (*(char*)&one == 0 ? 0 : 1);
++dnl   ])],
++dnl   [LCMS_BIGENDIAN=1],
++dnl   [LCMS_BIGENDIAN=0])
++dnl 
++dnl if test "x$LCMS_BIGENDIAN" != "x0"; then
++dnl   LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
++dnl   LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
++dnl   AC_MSG_RESULT(yes)
++dnl else
++dnl   LCMS_ENDIAN=
++dnl   LCMS2_ENDIAN=
++dnl   AC_MSG_RESULT(no)
++dnl fi
+ 
+ 
+ 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"
 SECTION = "console/utils"
 
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
 
-PR = "r3"
+PR = "r0"
 
 DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
 DEPENDS_virtclass-native = ""
@@ -27,12 +27,13 @@ SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-genarch.patch \
            file://objarch.h \
            file://ghostscript-9.02-parallel-make.patch \
+           file://ghostscript-9.05-NOT-check-endian.patch \
            "
 
 SRC_URI_virtclass-native = "${SRC_URI_BASE}"
 
-SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a"
-SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4"
+SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1"
+SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207"
 
 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \
                 --with-fontpath=${datadir}/fonts --with-install-cups"