Fixing several bugs, see ChangeLog

5 files changed, 222 insertions, 23 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 805d6457108a..39c265271894 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.81 2004/10/23 14:35:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.82 2004/11/12 10:57:59 phosphan Exp $
+
+*avifile-0.7.41.20041001-r1 (12 Nov 2004)
+
+  12 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/avifile-0.7.41.20041001-gcc2.patch,
+  +avifile-0.7.41.20041001-r1.ebuild:
+  Fixing bug #67441 (configure script stripped -g from CFLAGS - even in the
+  middle of a word), bug #68899 (hard-coded -lXrender in some Makefile, removing
+  it if not using X), bug #70074 (doesn't compile with gcc 2.95) and
+  bug #69511 (parts of the build did not use our CFLAGS)
 
   23 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   avifile-0.7.41.20041001.ebuild:
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 5a81f30dab58..ac93329e4966 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,31 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 10d9dfc4a6c701de6ee2f65bd51f0ea1 ChangeLog 14011
-MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
-MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432
 MD5 6d85afc659f23bb2adcebd144400833d avifile-0.7.38.20030710.ebuild 4488
-MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
+MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
 MD5 75f6f10626604e37b67c15f5fa92b6af avifile-0.7.41.20041001.ebuild 3951
+MD5 aa416e7de30500af07ccc09c0c5aa217 avifile-0.7.41.20041001-r1.ebuild 4322
+MD5 925a9acf94fe61343cb655dfafe994c8 ChangeLog 14472
+MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
+MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
+MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
+MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
-MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
-MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
-MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
-MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
-MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
-MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
 MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
 MD5 d0f665d4394d9d9a59c9a5dadeb09882 files/avifile-0.7.41.20041001-sparc.patch 1262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBemxLArHZZzCEUG0RAmoKAJ9pW/Eppl+12TC/ql1clklGuYFkPACggrn6
-RDk28EEqqbqKgxnJWQXSo6Q=
-=+aVY
------END PGP SIGNATURE-----
+MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
+MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
+MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
diff --git a/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild b/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
new file mode 100644
index 000000000000..56db09650c22
--- /dev/null
+++ b/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild,v 1.1 2004/11/12 10:57:59 phosphan Exp $
+
+inherit eutils flag-o-matic
+
+MAJ_PV=${PV:0:3}
+MIN_PV=${PV:0:6}
+MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Library for AVI-Files"
+HOMEPAGE="http://avifile.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+
+#-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
+KEYWORDS="~alpha ~amd64 ~ia64 -sparc ~x86"
+IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
+
+DEPEND=">=media-libs/jpeg-6b
+	x86? ( >=media-libs/divx4linux-20030428
+		>=media-libs/win32codecs-0.90 )
+	>=media-video/ffmpeg-0.4
+	=media-libs/xvid-1*
+	>=media-sound/lame-3.90
+	>=media-libs/audiofile-0.2.3
+	>=sys-apps/sed-4
+	>=media-sound/madplay-0.14.2b
+	>=sys-devel/patch-2.5.9
+	truetype? ( >=media-libs/freetype-2.1 )
+	xv? ( virtual/x11 )
+	sdl? ( >=media-libs/libsdl-1.2.2 )
+	dvd? ( >=media-libs/a52dec-0.7 )
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	X? ( virtual/x11 virtual/xft )
+	qt? ( >=x11-libs/qt-3.0.3 )
+	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	esd? ( >=media-sound/esound-0.2.28 )"
+
+src_unpack() {
+	unpack ${A}
+	use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
+
+	# make sure pkgconfig file is correct #53183
+	cd ${S}
+	epatch ${FILESDIR}/throw.patch
+	epatch ${FILESDIR}/${PN}-${PV}-gcc2.patch
+	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
+	rm -f avifile.pc
+	sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in \
+		|| die "sed failed (avifile.pc.in)"
+	sed -e "s:| sed s/-g//::" -i configure || die "sed failed (-g)"
+	# Fix qt detection
+	sed -i \
+		-e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
+		configure || die "sed failed (qt detection)"
+	# Fix hardcoded Xrender linking, bug #68899
+	if ! use X; then
+		sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
+		|| die "sed failed (Xrender)"
+	fi
+
+}
+
+src_compile() {
+	local myconf="--enable-oss --disable-xvid --enable-xvid4"
+	local kdepre=""
+
+	if [ "$XINERAMA" = "NO" ]; then
+		myconf="${myconf} --disable-xinerama"
+	fi
+
+	if [ "$DPMS" = "NO" ]; then
+		myconf="${myconf} --disable-dpms"
+	fi
+
+	if [ "$V4L" = "NO" ]; then
+		myconf="${myconf} --disable-v4l"
+	fi
+
+	if [ "$SUN" = "NO" ]; then
+		myconf="${myconf} --disable-sunaudio"
+	fi
+
+	if [ "$SBLIVE" = "NO" ]; then
+		myconf="${myconf} --disable-ac3passthrough"
+	fi
+
+	use debug \
+		&& myconf="${myconf} --enable-loader-out" \
+		|| myconf="${myconf} --enable-quiet"
+
+	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
+
+	if [ "$MGA" = "NO" ]; then
+		myconf="${myconf} --disable-mga"
+	fi
+
+	if [ "$DMALLOC" = "YES" ]; then
+		myconf="${myconf} --with-dmallocth"
+	fi
+
+	use qt \
+		&& myconf="${myconf} --with-qt-prefix=${QTDIR}" \
+		|| myconf="${myconf} --without-qt"
+
+	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
+	# borks, bug #11941.
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
+
+	filter-flags "-momit-leaf-frame-pointer"
+
+	export FFMPEG_CFLAGS="${CFLAGS}"
+
+	econf \
+		`use_enable static` \
+		`use_enable truetype freetype2` \
+		`use_enable xv` \
+		`use_enable sdl` `use_enable sdl sdltest` \
+		`use_enable dvd a52` `use_enable dvd ffmpeg-a52` \
+		`use_enable zlib libz` \
+		`use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
+		`use_with X x` `use_enable X xft` \
+		--enable-samples \
+		--disable-vidix \
+		--with-fpic \
+		--enable-lame-bin \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	use avi && dodir /usr/$(get_libdir)/win32
+
+	make DESTDIR="${D}" install || die
+
+	dodoc README INSTALL
+	cd doc
+	dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
+}
+
+src_test() {
+	ewarn "Testing disabled for this ebuild."
+}
+
+pkg_postinst() {
+	if use qt; then # else no aviplay built
+		einfo "In order to use certain video modes, you must be root"
+		einfo "chmod +s /usr/bin/aviplay to suid root"
+		einfo "As this is considered a security risk on multiuser"
+		einfo "systems, this is not done by default"
+	fi
+}
diff --git a/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch b/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch
new file mode 100644
index 000000000000..b8cbfa532e55
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch
@@ -0,0 +1,36 @@
+--- lib/subtitle/subread.c~	2004-03-28 09:45:08 -0500
++++ lib/subtitle/subread.c	2004-11-04 14:40:52 -0500
+@@ -101,11 +101,12 @@
+     {
+ 	int n = 0;
+ 	char* b = trim_spaces(txt);
+-        trim_http(b);
++	char* t;
++	trim_http(b);
+ 
+ 	// skip color and font-style change - not supported right now
+ 	// {c:$00ffff} {y:i}
+-	char* t = strchr(b, '{');
++	t = strchr(b, '{');
+ 	if (t)
+ 	{
+ 	    char u = toupper(t[1]);
+--- ffmpeg/libavcodec/libpostproc/postprocess_template.c~	2004-09-30 10:55:16 -0400
++++ ffmpeg/libavcodec/libpostproc/postprocess_template.c	2004-11-04 14:20:43 -0500
+@@ -2731,6 +2731,7 @@
+ 	if(dc_mask & eq_mask){
+ 		int offset= -8*step;
+ 		int64_t *temp_sums= sums;
++		int xxx;
+ 
+ 		asm volatile(
+ 		"movq %2, %%mm0					\n\t"  // QP,..., QP
+@@ -2870,7 +2871,7 @@
+ 		);
+ 
+ 		src+= step; // src points to begin of the 8x8 Block
+-                int xxx = dc_mask & eq_mask;
++                xxx = dc_mask & eq_mask;
+ 		asm volatile(
+ 		"movq %4, %%mm6					\n\t"
+ 		"pcmpeqb %%mm5, %%mm5				\n\t"
diff --git a/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1 b/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1
new file mode 100644
index 000000000000..019a69ee1a1c
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1
@@ -0,0 +1 @@
+MD5 a08911965d81a02ded95ddb95f63e1cf avifile-0.7-0.7.41.tar.gz 3498203