add fix for possible libmpeg bug

5 files changed, 20 insertions, 183 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 6ec5a11bc393..bf8159e53f4f 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,7 +1,6 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.46 2003/08/04 08:40:43 kumba Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.47 2003/08/10 23:39:06 foser Exp $
 
 *gimp-1.3.17 (25 Jul 2003)
 
@@ -32,6 +31,9 @@
 
 *gimp-1.2.5 (17 Jun 2003)
 
+  11 Aug 2003; foser <foser@gentoo.org> gimp-1.2.5.ebuild :
+  Added workaround for possible libmpeg problems (#21924)
+
   17 Jun 2003; foser <foser@gentoo.org> gimp-1.2.5.ebuild :
   New version, add AA fix to be on the safe side
   tidy up filterflags stuff a bit
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 0c300f7a9085..16a6531a1891 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,20 +1,18 @@
-MD5 b8f98b223816bdca6b511dfd9873a3d3 ChangeLog 7519
-MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
-MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 b0e19c97a61c41bd47f0783ca135d07d gimp-1.2.4.ebuild 3091
-MD5 4c0ee765b6864845a0df8a0c3ac9014a gimp-1.2.5.ebuild 3200
 MD5 789c502d34f4e1a21f1d225da50e5864 gimp-1.3.17.ebuild 2413
+MD5 df9bc36615a041850ff9feaf1d0df2c5 gimp-1.2.5.ebuild 3257
 MD5 c3dc61c814aa0cc40bf9b53c95128d8b gimp-1.3.16.ebuild 2425
+MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
+MD5 b0e19c97a61c41bd47f0783ca135d07d gimp-1.2.4.ebuild 3091
+MD5 360a8f4c1d431bf4a6d0993c553c7901 ChangeLog 7637
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
-MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
-MD5 bc0cf9570b3e8a71b95426095b0ca86c files/digest-gimp-1.3.17 66
-MD5 e8adce46a21cdb214def668b6577902c files/digest-gimp-1.3.16 66
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
+MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
+MD5 e8adce46a21cdb214def668b6577902c files/digest-gimp-1.3.16 66
+MD5 bc0cf9570b3e8a71b95426095b0ca86c files/digest-gimp-1.3.17 66
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
+MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.3-r2 b/media-gfx/gimp/files/digest-gimp-1.2.3-r2
deleted file mode 100644
index 174f1d822a12..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.2.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b19235f19f524f772a4aef597a69b1da gimp-1.2.3.tar.bz2 10795020
diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
deleted file mode 100644
index 7fe1198c0af9..000000000000
--- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.15 2003/06/07 17:20:51 foser Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="python nls gnome aalib perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP -- GNU Image Manipulation Program"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-SLOT="1.2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1
-		>=dev-perl/Parse-RecDescent-1.80
-		>=dev-perl/gtk-perl-0.7004 )
-	python? ( >=dev-lang/python-2.0 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake
-	>=media-libs/mpeg-lib-1.3.1
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}/plug-ins/common
-	# compile with nonstandard psd_save plugin
-	cp ${FILESDIR}/psd_save.c .
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-	cd ${S}
-	
-	if [ -f ${ROOT}/usr/share/gettext/config.rpath ] ; then
-		cp -f ${ROOT}/usr/share/gettext/config.rpath ${S}
-	else
-		touch ${S}/config.rpath
-		chmod 0755 ${S}/config.rpath
-	fi
-	
-	echo ">>> Reconfiguring package..."
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_5=1
-	# Newer gettext borks if not forced ...
-	echo "AM_GNU_GETTEXT_VERSION(0.10.0)" >> ${S}/configure.in
-	(cp ${S}/intl/Makefile.* ${T}; rm -rf ${S}/intl/*; \
-	 cp ${T}/Makefile.* ${S}/intl/)
-	automake --add-missing
-	autoreconf --install --symlink &> ${T}/autoreconf.log || ( \
-		echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log
-		eerror "Reonfigure failed, please attatch the contents of:"
-		eerror
-		eerror "  ${T}/autoreconf.log"
-		eerror
-		eerror "in your bugreport."
-		# we need an error here, else the ebuild do not die
-		exit 1
-	) || die "running autoreconf failed"
-	touch plug-ins/common/gimp-1.2.3.tar.bz2
-}
-
-src_compile() {
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6*" && filter-flags "-fomit-frame-pointer"
-
-
-	local myconf=""
-	local mymake=""
-	local myvars=""
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if [ -z "`use perl`" ] ; then
-		myconf="${myconf} --disable-perl"
-	else
-		export  PERL_MM_OPT=' PREFIX=${D}/usr'
-		myconf="${myconf} --enable-perl"
-	fi
-
-	if [ -z "`use python`" ] ; then
-		myconf="${myconf} --disable-python"
-	else
-		myconf="${myconf} --enable-python"
-	fi
-
-	if [ -z "`use aalib`" ] ; then
-		mymake="LIBAA= AA="
-	fi
-
-	if [ -z "`use gnome`" ] ; then
-		mymake="${mymake} HELPBROWSER="
-	fi
-
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--sysconfdir=/etc \
-			--with-mp \
-			--with-threads \
-			--disable-debug \
-			${myconf} || die
-
-	if [ -z "`use aalib`" ] ; then 
-		# Horrible automake brokenness
-		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
-		cat plug-ins/common/Makefile.orig | \
-			sed 's/CML_explorer$(EXEEXT) aa/CML_explorer$(EXEEXT)/' \
-			> plug-ins/common/Makefile
-	fi
-
-	# Doesn't work with -j 4 (hallski)
-	MAKEOPTS="-j1" emake ${mymake} || die
-}
-
-src_install() {
-
-	local mymake="" 
-	if [ -z "`use aalib`" ] ; then
-		mymake="LIBAA= AA="
-	fi
-
-	if [ -z "`use gnome`" ] ; then
-		mymake="${mymake} HELPBROWSER="
-	fi
-  
-	dodir /usr/lib/gimp/1.2/plug-ins
-	
-	make prefix=${D}/usr \
-		 gimpsysconfdir=${D}/etc/gimp/1.2 \
-		 mandir=${D}/usr/share/man \
-		 infodir=${D}/usr/share/info \
-		 PREFIX=${D}/usr \
-		 INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		 INSTALLSCRIPT=${D}/usr/bin \
-		 INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		 INSTALLBIN=${D}/usr/bin \
-		 INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		 INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		 ${mymake} \
-		 install || die
-
-	dosym gimp-1.2 /usr/bin/gimp
-	#this next line closes bug #810
-	dosym gimptool-1.2 /usr/bin/gimptool
-	
-	preplib /usr
-	
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-	dohtml -r devel-docs
-	docinto devel
-	dodoc devel-docs/*.txt
-}
-
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index 733b038aa947..a361af14f6f1 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.5 2003/07/19 23:06:53 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.6 2003/08/10 23:39:06 foser Exp $
 
 inherit eutils flag-o-matic
 
@@ -77,6 +77,9 @@ src_compile() {
 	fi
 
 	MAKEOPTS="${MAKEOPTS} -j1"
+	# see bug #21924
+	CFLAGS="${CFLAGS} /usr/lib/libmpeg.a"
+
 	emake ${mymake} || die
 }