From ae2c5f24771b333f3419aeacae4d2e16daf7badd Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Wed, 14 Mar 2012 17:03:42 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../ghostscript/ghostscript-9.02-genarch.patch | 12 +-- .../ghostscript-9.05-NOT-check-endian.patch | 54 ++++++++++ .../ghostscript/ghostscript_9.04.bb | 116 -------------------- .../ghostscript/ghostscript_9.05.bb | 117 +++++++++++++++++++++ 4 files changed, 177 insertions(+), 122 deletions(-) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript_9.04.bb create mode 100644 meta/recipes-extended/ghostscript/ghostscript_9.05.bb (limited to 'meta/recipes-extended/ghostscript') 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 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 + +--- 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 ], [ +- 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 ], [ ++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.04.bb deleted file mode 100644 index 3f9d7b5cb9..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "The GPL Ghostscript PostScript/PDF interpreter" -DESCRIPTION = "Ghostscript is used for PostScript/PDF preview and printing. Usually as \ -a back-end to a program such as ghostview, it can display PostScript and PDF \ -documents in an X11 environment. \ -\ -Furthermore, it can render PostScript and PDF files as graphics to be printed \ -on non-PostScript printers. Supported printers include common \ -dot-matrix, inkjet and laser models. \ -\ -Package gsfonts contains a set of standard fonts for Ghostscript. \ -" -HOMEPAGE = "http://www.ghostscript.com" -SECTION = "console/utils" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24" - -PR = "r3" - -DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" -DEPENDS_virtclass-native = "" - -SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz" - -SRC_URI = "${SRC_URI_BASE} \ - file://ghostscript-9.02-prevent_recompiling.patch \ - file://ghostscript-9.02-genarch.patch \ - file://objarch.h \ - file://ghostscript-9.02-parallel-make.patch \ - " - -SRC_URI_virtclass-native = "${SRC_URI_BASE}" - -SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a" -SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4" - -EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ - --with-fontpath=${datadir}/fonts --with-install-cups" - -# This has been fixed upstream but for now we need to subvert the check for time.h -# http://bugs.ghostscript.com/show_bug.cgi?id=692443 -# http://bugs.ghostscript.com/show_bug.cgi?id=692426 -CFLAGS += "-DHAVE_SYS_TIME_H=1" -BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" - -inherit autotools - -do_configure_prepend () { - mkdir -p obj - mkdir -p soobj - if [ -e ${WORKDIR}/objarch.h ]; then - cp ${WORKDIR}/objarch.h obj/arch.h - fi -} - -do_configure_append () { - # copy tools from the native ghostscript build - if [ "${PN}" != "ghostscript-native" ]; then - mkdir -p obj/aux soobj - for i in genarch genconf mkromfs echogs gendev genht; do - cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i - done - fi - - # replace cups paths from sysroots/.../usr/bin/crossscripts/cups-config with target paths - # CUPSDATA is compiled into a utility, and CUPSSERVERBIN is used as an install path - CUPSSERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir - CUPSDATA=${datadir}/cups - - sed -e "s#^CUPSSERVERBIN=.*#CUPSSERVERBIN=${CUPSSERVERBIN}#" -i Makefile - sed -e "s#^CUPSDATA=.*#CUPSDATA=${CUPSDATA}#" -i Makefile -} - -do_install_append () { - mkdir -p ${D}${datadir}/ghostscript/${PV}/ - cp -r Resource ${D}${datadir}/ghostscript/${PV}/ - cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/ - - chown -R root:lp ${D}${sysconfdir}/cups -} - -python do_patch_virtclass-native () { - pass -} - -do_compile_virtclass-native () { - mkdir -p obj - for i in genarch genconf mkromfs echogs gendev genht; do - oe_runmake obj/aux/$i - done -} - -do_install_virtclass-native () { - install -d ${D}${bindir}/ghostscript-${PV} - for i in genarch genconf mkromfs echogs gendev genht; do - install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i - done -} - -BBCLASSEXTEND = "native" - -# Ghostscript install tool 'instcopy' tries to remove already created -# directories during install and parallel make causes problems. -PARALLEL_MAKEINST="" - -PACKAGES =+ "${PN}-cups" - -FILES_${PN}-dbg += "${exec_prefix}/lib/cups/filter/.debug" - -FILES_${PN}-cups += "${exec_prefix}/lib/cups/filter/gstoraster \ - ${exec_prefix}/lib/cups/filter/pstopxl \ - ${datadir}/cups \ - ${sysconfdir}/cups \ - " - -RDEPENDS_${PN}-cups = "${PN}" diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb new file mode 100644 index 0000000000..6c1d1a927e --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb @@ -0,0 +1,117 @@ +SUMMARY = "The GPL Ghostscript PostScript/PDF interpreter" +DESCRIPTION = "Ghostscript is used for PostScript/PDF preview and printing. Usually as \ +a back-end to a program such as ghostview, it can display PostScript and PDF \ +documents in an X11 environment. \ +\ +Furthermore, it can render PostScript and PDF files as graphics to be printed \ +on non-PostScript printers. Supported printers include common \ +dot-matrix, inkjet and laser models. \ +\ +Package gsfonts contains a set of standard fonts for Ghostscript. \ +" +HOMEPAGE = "http://www.ghostscript.com" +SECTION = "console/utils" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" + +PR = "r0" + +DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" +DEPENDS_virtclass-native = "" + +SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz" + +SRC_URI = "${SRC_URI_BASE} \ + file://ghostscript-9.02-prevent_recompiling.patch \ + 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] = "f7c6f0431ca8d44ee132a55d583212c1" +SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" + +EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ + --with-fontpath=${datadir}/fonts --with-install-cups" + +# This has been fixed upstream but for now we need to subvert the check for time.h +# http://bugs.ghostscript.com/show_bug.cgi?id=692443 +# http://bugs.ghostscript.com/show_bug.cgi?id=692426 +CFLAGS += "-DHAVE_SYS_TIME_H=1" +BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" + +inherit autotools + +do_configure_prepend () { + mkdir -p obj + mkdir -p soobj + if [ -e ${WORKDIR}/objarch.h ]; then + cp ${WORKDIR}/objarch.h obj/arch.h + fi +} + +do_configure_append () { + # copy tools from the native ghostscript build + if [ "${PN}" != "ghostscript-native" ]; then + mkdir -p obj/aux soobj + for i in genarch genconf mkromfs echogs gendev genht; do + cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i + done + fi + + # replace cups paths from sysroots/.../usr/bin/crossscripts/cups-config with target paths + # CUPSDATA is compiled into a utility, and CUPSSERVERBIN is used as an install path + CUPSSERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir + CUPSDATA=${datadir}/cups + + sed -e "s#^CUPSSERVERBIN=.*#CUPSSERVERBIN=${CUPSSERVERBIN}#" -i Makefile + sed -e "s#^CUPSDATA=.*#CUPSDATA=${CUPSDATA}#" -i Makefile +} + +do_install_append () { + mkdir -p ${D}${datadir}/ghostscript/${PV}/ + cp -r Resource ${D}${datadir}/ghostscript/${PV}/ + cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/ + + chown -R root:lp ${D}${sysconfdir}/cups +} + +python do_patch_virtclass-native () { + pass +} + +do_compile_virtclass-native () { + mkdir -p obj + for i in genarch genconf mkromfs echogs gendev genht; do + oe_runmake obj/aux/$i + done +} + +do_install_virtclass-native () { + install -d ${D}${bindir}/ghostscript-${PV} + for i in genarch genconf mkromfs echogs gendev genht; do + install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i + done +} + +BBCLASSEXTEND = "native" + +# Ghostscript install tool 'instcopy' tries to remove already created +# directories during install and parallel make causes problems. +PARALLEL_MAKEINST="" + +PACKAGES =+ "${PN}-cups" + +FILES_${PN}-dbg += "${exec_prefix}/lib/cups/filter/.debug" + +FILES_${PN}-cups += "${exec_prefix}/lib/cups/filter/gstoraster \ + ${exec_prefix}/lib/cups/filter/pstopxl \ + ${datadir}/cups \ + ${sysconfdir}/cups \ + " + +RDEPENDS_${PN}-cups = "${PN}" -- cgit v1.2.3-54-g00ecf