diff options
| author |   Markus Meier <maekke@gentoo.org> | 2008-08-20 21:57:09 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2008-08-20 21:57:09 +0000 |
| commit | c0eab0f51469bc9fe193abda265263e0af91535b (patch) | |
| tree | daf952acae1b93c695f77569a9a5fa32f34cde35 /media-gfx/imagemagick | |
| parent | Masking beta x11-drivers/nvidia-drivers-177.67 package, unsupported beta. (diff) | |
| download | gentoo-2-c0eab0f51469bc9fe193abda265263e0af91535b.tar.gz gentoo-2-c0eab0f51469bc9fe193abda265263e0af91535b.tar.bz2 gentoo-2-c0eab0f51469bc9fe193abda265263e0af91535b.zip | |
readd jbig USE-flag, by Fabian Groffen <grobian@gentoo.org> in bug #235131
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc2 i686)
Diffstat (limited to 'media-gfx/imagemagick')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch | 39 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild | 11 |
3 files changed, 52 insertions, 4 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index aa2998d0d08a..1a0c6b12fa88 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.298 2008/08/19 22:30:46 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.299 2008/08/20 21:57:08 maekke Exp $ + + 20 Aug 2008; Markus Meier <maekke@gentoo.org> + +files/imagemagick-6.4.2.9-jbig.patch, imagemagick-6.4.2.9.ebuild: + readd jbig USE-flag, by Fabian Groffen <grobian@gentoo.org> in bug #235131 19 Aug 2008; Markus Meier <maekke@gentoo.org> imagemagick-6.4.2.9.ebuild: do not die if sys-devel/gcc has no openmp USE-flag, just disable it. bug diff --git a/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch b/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch new file mode 100644 index 000000000000..2b30c79629b6 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch @@ -0,0 +1,39 @@ +--- configure.ac.orig 2008-08-20 08:04:11 +0200 ++++ configure.ac 2008-08-20 08:05:08 +0200 +@@ -1795,6 +1795,11 @@ + # + # Check for JBIG delegate library. + # ++AC_ARG_WITH([jbig], ++ [AC_HELP_STRING([--without-jbig], ++ [disable JBIG support])], ++ [with_jbig=$withval], ++ [with_jbig='yes']) + have_jbig='no' + JBIG_LIBS='' + if test "$with_jbig" != 'no'; then +--- configure.orig 2008-08-20 08:12:56 +0200 ++++ configure 2008-08-20 08:15:05 +0200 +@@ -1261,6 +1261,7 @@ + with_fontpath + with_gs_font_dir + with_gvc ++with_jbig + with_jpeg + with_jp2 + with_lcms +@@ -37245,6 +37246,14 @@ + + + ++if test "${with_jbig+set}" = set; then ++ withval=$with_jbig; with_jbig=$withval ++else ++ with_jbig='yes' ++fi ++if test "$with_jbig" != 'yes'; then ++ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jbig=$with_jbig " ++fi + + # + # Check for JBIG delegate library. diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild index 4b06af6e39c1..56eee2147f29 100644 --- a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.4 2008/08/19 22:30:46 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.5 2008/08/20 21:57:08 maekke Exp $ -inherit eutils multilib perl-app toolchain-funcs +inherit eutils multilib perl-app toolchain-funcs autotools MY_PN=ImageMagick MY_P=${MY_PN}-${PV%.*} @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" LICENSE="imagemagick" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jpeg jpeg2k lcms nocxx +IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib" RDEPEND="bzip2? ( app-arch/bzip2 ) @@ -24,6 +24,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) graphviz? ( >=media-gfx/graphviz-2.6 ) gs? ( virtual/ghostscript ) + jbig? ( media-libs/jbigkit ) jpeg? ( >=media-libs/jpeg-6b ) jpeg2k? ( media-libs/jasper ) lcms? ( >=media-libs/lcms-1.06 ) @@ -73,6 +74,9 @@ src_unpack() { 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ "${S}"/configure || die + cd "${S}" + epatch "${FILESDIR}"/${P}-jbig.patch + eautoreconf } src_compile() { @@ -124,6 +128,7 @@ src_compile() { $(use_with gs dps) \ $(use_with gs gslib) \ $(use_with graphviz gvc) \ + $(use_with jbig) \ $(use_with jpeg jpeg) \ $(use_with jpeg2k jp2) \ $(use_with lcms) \ |