From 82024dc01382a876211dc3db1574eee29bb8c619 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 19 Apr 2012 14:37:48 -0400 Subject: [PATCH] ghostscript-gpl: upgrade to latest stable version. Upgraded media-libs/jbig2dec to version 0.11-r1 on amd64, arm, x86. Needed for lcms upgrade which is needed for virtual/jpeg. BUG=chromium-os:25177 TEST=`cbuildbot chromiumos-sdk` works Change-Id: Id7fe53517357ff34fd2df02313ead8c151007297 Reviewed-on: https://gerrit.chromium.org/gerrit/20617 Commit-Ready: Mike Frysinger Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger --- .../app-text/ghostscript-gpl/Manifest | 4 +- ...-r3.ebuild => ghostscript-gpl-9.05.ebuild} | 43 ++++++++++++------- .../app-text/ghostscript-gpl-9.04-r3 | 13 ------ .../md5-cache/app-text/ghostscript-gpl-9.05 | 13 ++++++ 4 files changed, 43 insertions(+), 30 deletions(-) rename sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/{ghostscript-gpl-9.04-r3.ebuild => ghostscript-gpl-9.05.ebuild} (83%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.05 diff --git a/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/Manifest b/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/Manifest index cc2669d929..aa97677357 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/Manifest @@ -1,3 +1,3 @@ -DIST ghostscript-9.04.tar.bz2 29869900 RMD160 916bcacac247241fcf6ba02e90dc7e28040ba65e SHA1 df9c9e1924038da071d0ffbaddf42a75ecbc1e83 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4 -DIST ghostscript-gpl-9.04-patchset-3.tar.bz2 7760 RMD160 43a38afd1e8de506db70a58d0fa3168dba3c3a6e SHA1 03b27dad2e4cbec045f2264885bf366526e2db00 SHA256 b3c20adc111b8ddf3bc7d60a01fa1b31eadb9d6d9eb8ac474d9aa1604bd51b6f +DIST ghostscript-9.05.tar.bz2 28279634 RMD160 27935f60083b788b2793b19ee42f3663082ba084 SHA1 1a54a846e90ae95b5307f4f0459d044b9597d8cf SHA256 0f41212af3a5a552ab2302cd90606dc8245be34490a699726dc95ed3cd89ceac +DIST ghostscript-gpl-9.05-patchset-1.tar.bz2 4480 RMD160 bdaf9dbd59d0445a0ee6049c487ae872bda260fa SHA1 bf2cbe0668af57c5edd700650e861ad5579b8f0e SHA256 30e31b11e72a115ee2cd3d01f6a638bc808427bc9579e8c9e1f84b073a19fa9f DIST gsdjvu-1.5.tar.gz 207583 RMD160 010be2cd791d5e2814c1f6554150bfd7c34222c0 SHA1 c7d0677dae5fe644cf3d714c04b3c2c343906342 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4 diff --git a/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r3.ebuild rename to sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild index 86be4e7d5c..7506b97980 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r3.ebuild,v 1.5 2011/10/06 17:41:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild,v 1.3 2012/04/05 19:47:38 dilfridge Exp $ EAPI=3 + inherit autotools eutils versionator flag-o-matic DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF" @@ -11,21 +12,24 @@ HOMEPAGE="http://ghostscript.com/" MY_P=${P/-gpl} GSDJVU_PV=1.5 PVM=$(get_version_component_range 1-2) -SRC_URI="!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) ) +SRC_URI=" mirror://sourceforge/ghostscript/${MY_P}.tar.bz2 - mirror://gentoo/${P}-patchset-3.tar.bz2" + mirror://gentoo/${P}-patchset-1.tar.bz2 + !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )" LICENSE="GPL-3 CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X" -COMMON_DEPEND="app-text/libpaper +COMMON_DEPEND=" + app-text/libpaper media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:0 - >=media-libs/libpng-1.2.42 - >=media-libs/tiff-3.9.2 + >=media-libs/freetype-2.4.2:2 + media-libs/jbig2dec + media-libs/lcms:2 + media-libs/libpng:0 + media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) @@ -45,7 +49,10 @@ RDEPEND="${COMMON_DEPEND} linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) - linguas_zh_TW? ( media-fonts/arphicfonts )" + linguas_zh_TW? ( media-fonts/arphicfonts ) + !!media-fonts/gnu-gs-fonts-std + !!media-fonts/gnu-gs-fonts-other +" S="${WORKDIR}/${MY_P}" @@ -66,9 +73,11 @@ src_prepare() { rm -rf "${S}"/expat rm -rf "${S}"/freetype rm -rf "${S}"/jasper + rm -rf "${S}"/jbig2dec rm -rf "${S}"/jpeg rm -rf "${S}"/lcms{,2} rm -rf "${S}"/libpng + rm -rf "${S}"/openjpeg rm -rf "${S}"/tiff rm -rf "${S}"/zlib # remove internal urw-fonts @@ -87,6 +96,7 @@ src_prepare() { cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base" epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch" + epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.5-${PN}-9.05.patch" cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib" cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu" grep -q djvusep "${S}/base/contrib.mak" || \ @@ -113,9 +123,6 @@ src_prepare() { cd "${S}" eautoreconf - cd "${S}/jbig2dec" - eautoreconf - cd "${S}/ijs" eautoreconf } @@ -140,6 +147,7 @@ src_configure() { --enable-freetype \ --enable-fontconfig \ --disable-compile-inits \ + --disable-openjpeg \ --with-drivers=ALL \ --with-fontpath="$FONTPATH" \ --with-ijs \ @@ -174,9 +182,14 @@ src_compile() { } src_install() { - # -j1 -> see bug #356303 + # workaround: -j1 -> see bug #356303 emake -j1 DESTDIR="${D}" install-so install || die "emake install failed" + # workaround: some printer drivers still require pstoraster, bug #383831 + use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster + # workaround: do the same for pstopxl as of gs 9.05 + use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl + if ! use bindist && use djvu ; then dobin gsdjvu || die "dobin gsdjvu install failed" fi diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r3 deleted file mode 100644 index 404e0272e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup -DEPEND=app-text/libpaper media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:0 >=media-libs/libpng-1.2.42 >=media-libs/tiff-3.9.2 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF -EAPI=3 -HOMEPAGE=http://ghostscript.com/ -IUSE=bindist cups dbus djvu gtk idn jpeg2k static-libs X linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd -LICENSE=GPL-3 CPL-1.0 -RDEPEND=app-text/libpaper media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:0 >=media-libs/libpng-1.2.42 >=media-libs/tiff-3.9.2 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) -SLOT=0 -SRC_URI=!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) ) mirror://sourceforge/ghostscript/ghostscript-9.04.tar.bz2 mirror://gentoo/ghostscript-gpl-9.04-patchset-3.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed -_md5_=3e8fe58d8cae1ab073f4ab5e3ad4917f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.05 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.05 new file mode 100644 index 0000000000..68bd422c82 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-text/ghostscript-gpl-9.05 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup +DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF +EAPI=3 +HOMEPAGE=http://ghostscript.com/ +IUSE=bindist cups dbus djvu gtk idn jpeg2k static-libs X linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-3 CPL-1.0 +RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other +SLOT=0 +SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) ) +_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=a97eb25ed8b612c3a091a8f70034172b