summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch51
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.05.bb15
2 files changed, 63 insertions, 3 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
new file mode 100644
index 0000000000..ce254f6ece
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
@@ -0,0 +1,51 @@
1ghostscript-native:fix disable-system-libtiff
2
3Modify configure to add the check to make sure
4ghostscrip could work while system-libtiff is
5disabled.
6
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8Upstream-Status: Pending
9---
10diff --git a/base/configure.ac b/base/configure.ac
11index bb05105..4b817ac 100644
12--- a/base/configure.ac
13+++ b/base/configure.ac
14@@ -814,17 +814,23 @@ Disabling tiff output devices.])
15 esac
16
17 if test $SHARE_LIBTIFF -eq 0; then
18- echo
19- echo "Running libtiff configure script..."
20- olddir=`pwd`
21- cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS
22- status=$?
23- if test "$status" -ne 0 ; then
24- AC_MSG_ERROR([libtiff configure script failed], $status)
25- fi
26- cd $olddir
27- echo
28- echo "Continuing with Ghostscript configuration..."
29+ if test -e $LIBTIFFDIR/configure; then
30+ echo
31+ echo "Running libtiff configure script..."
32+ olddir=`pwd`
33+ cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS
34+ status=$?
35+ if test "$status" -ne 0 ; then
36+ AC_MSG_ERROR([libtiff configure script failed], $status)
37+ fi
38+ cd $olddir
39+ echo
40+ echo "Continuing with Ghostscript configuration..."
41+ else
42+ AC_MSG_NOTICE([Could not find local copy of libtiff.
43+Disabling tiff output devices.])
44+ fi
45+
46 fi
47
48 AC_SUBST(SHARE_LIBTIFF)
49--
501.7.10.4
51
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
index 2789897917..93c503fb74 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
@@ -15,7 +15,7 @@ SECTION = "console/utils"
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
17 17
18PR = "r4" 18PR = "r5"
19 19
20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_class-native = "" 21DEPENDS_class-native = ""
@@ -31,8 +31,9 @@ SRC_URI = "${SRC_URI_BASE} \
31 " 31 "
32 32
33SRC_URI_class-native = "${SRC_URI_BASE} \ 33SRC_URI_class-native = "${SRC_URI_BASE} \
34 file://0001-make-ghostscript-work-with-long-building-directory.patch \ 34 file://0001-make-ghostscript-work-with-long-building-directory.patch \
35 " 35 file://ghostscript-native-fix-disable-system-libtiff.patch \
36 "
36 37
37SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1" 38SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1"
38SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" 39SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207"
@@ -40,6 +41,14 @@ SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a1
40EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ 41EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \
41 --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn" 42 --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn"
42 43
44# Explicity disable libtiff, fontconfig,
45# freetype, cups for ghostscript-native
46EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
47 --without-jbig2dec --without-jasper \
48 --with-fontpath=${datadir}/fonts \
49 --without-libidn --disable-fontconfig \
50 --disable-freetype --disable-cups"
51
43# This has been fixed upstream but for now we need to subvert the check for time.h 52# This has been fixed upstream but for now we need to subvert the check for time.h
44# http://bugs.ghostscript.com/show_bug.cgi?id=692443 53# http://bugs.ghostscript.com/show_bug.cgi?id=692443
45# http://bugs.ghostscript.com/show_bug.cgi?id=692426 54# http://bugs.ghostscript.com/show_bug.cgi?id=692426