Fix broken acinclude.m4 that have a broken SDL test that clobber '/usr/lib64' to '4'.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 201 insertions, 16 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 88a334b9c2d5..dad467cd9891 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.104 2005/06/19 15:59:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.105 2005/06/28 22:13:30 azarah Exp $
+
+*avifile-0.7.43.20050224-r2 (28 Jun 2005)
+
+  28 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  +avifile-0.7.43.20050224-r2.ebuild:
+  Fix broken acinclude.m4 that have a broken SDL test that clobber
+  '/usr/lib64' to '4'.
 
   18 Jun 2005; Guy Martin <gmsoft@gentoo.org> files/avifile-mad.patch,
   avifile-0.7.43.20050224-r1.ebuild:
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 1582acfd27dd..7a597ea0ef46 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,24 +1,36 @@
-MD5 9ab35b4951adc50e37dd047ff5db3683 ChangeLog 19832
-MD5 8189fed5f2b9cff0684bcbb12eb3b290 avifile-0.7.43.20050224-r1.ebuild 4853
-MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8190007504cb65cf7521e714ac91d488 avifile-0.7.43.20050224-r2.ebuild 4758
 MD5 87aed7721dcd888c80b219218c704004 avifile-0.7.41.20041001-r1.ebuild 4620
 MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
+MD5 8189fed5f2b9cff0684bcbb12eb3b290 avifile-0.7.43.20050224-r1.ebuild 4853
+MD5 538ca629b4da56ade6273920473f5022 ChangeLog 20056
+MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
-MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-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 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
-MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
 MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
+MD5 7404620a2904bb27683df4a0ed2f412d files/avifile-0.7.43.20050224-fixlabels.patch 559
+MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
 MD5 6cab3d2acc1d30f101f100f9549613d8 files/avifile-0.7.43.20050224-sdllibs.patch 569
+MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 1c397a5be4ce93dd90fde2b9ab3aa937 files/avifile-mad.patch 1846
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
+MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
+MD5 d004578ed49e07cac372c21c044775fe files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch 5878
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r2 72
+MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
+MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
+MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
-MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
-MD5 1c397a5be4ce93dd90fde2b9ab3aa937 files/avifile-mad.patch 1846
+MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
 MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
-MD5 7404620a2904bb27683df4a0ed2f412d files/avifile-0.7.43.20050224-fixlabels.patch 559
-MD5 d004578ed49e07cac372c21c044775fe files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch 5878
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwcvr1ZcsMnZjRyIRAmTyAJoDkQe9hxi3ndP5fHkf0JClxnSs9wCgqxKX
+3ju1Uni4yjl+kKujaRLj4yg=
+=wocs
+-----END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
new file mode 100644
index 000000000000..48178a4ef39f
--- /dev/null
+++ b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.1 2005/06/28 22:13:30 azarah 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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sparc ~x86"
+IUSE="3dnow X alsa debug divx4linux dmalloc dpms a52 encode esd mad matrox
+mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
+zlib"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	win32codecs? ( >=media-libs/win32codecs-0.90 )
+	divx4linux? ( >=media-libs/divx4linux-20030428 )
+	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
+	a52? ( >=media-libs/a52dec-0.7 )
+	encode? ( >=media-sound/lame-3.90 )
+	esd? ( >=media-sound/esound-0.2.28 )
+	mad? ( media-libs/libmad )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	qt? ( >=x11-libs/qt-3.0.3 )
+	sdl? ( >=media-libs/libsdl-1.2.2 )
+	truetype? ( >=media-libs/freetype-2.1 )
+	xv? ( virtual/x11 )
+	xvid? ( =media-libs/xvid-1* )
+	X? ( virtual/x11 virtual/xft )
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	>=media-video/ffmpeg-0.4.9_p20050226-r2
+	>=media-libs/jpeg-6b"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/automake-1.4_p6
+	sys-devel/libtool"
+#	v4l needs linux headers
+#	v4l? ( virtual/os-headers )
+
+pkg_setup() {
+	if use qt && use dmalloc; then
+		die "Sorry, qt and dmalloc can't be enabled at the same time."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
+	# removes sed-out of -L/usr/lib(64?) on sdl libs flags
+	epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch
+	# fixes bug #86320
+	epatch ${FILESDIR}/${P}-fixlabels.patch
+	# fix building with gcc4
+	# http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
+	epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
+
+	if ! use qt ; then
+		sed -i -e 's/qtvidcap\ qtrecompress//g' \
+		${S}/samples/Makefile.am || die "qt based sample test removal failed"
+	fi
+
+	# Fix hardcoded Xrender linking, bug #68899
+	if ! use X; then
+		sed -i -e 's/-lXrender//g' ${S}/lib/video/Makefile.* || die "sed failed (Xrender)"
+	fi
+
+	# Stop them from stripping out -g
+	sed -i -e "s:| sed s/-g//::" ${S}/configure{,.ac} || die "sed failed (-g)"
+
+	# Run autotools...
+	cd ${S}
+	[[ -f configure.ac && -f configure.in ]] && rm -f configure.in
+	# acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
+	[[ -f acinclude.m4 ]] && rm -f acinclude.m4
+
+	# Reconfigure autotools
+	ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
+
+	# fixes mad FPM detection
+	epatch ${FILESDIR}/${PN}-mad.patch
+
+	# make sure pkgconfig file is correct #53183
+	rm -f avifile.pc
+}
+
+src_compile() {
+	local myconf=""
+	local kdepre=""
+
+	use debug \
+		&& myconf="${myconf} --enable-loader-out" \
+		|| myconf="${myconf} --enable-quiet"
+
+	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
+
+	use encode \
+		&& myconf="${myconf} --disable-lame --enable-lamebin" \
+		|| myconf="${myconf} --enable-lame --disable-lamebin"
+
+	# 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 win32codecs win32) \
+		$(use_with dmalloc dmallocth) \
+		$(use_enable a52) $(use_enable a52 ffmpeg-a52) \
+		$(use_enable dpms) \
+		$(use_enable mad) $(use_enable mad libmad) \
+		$(use_enable matrox mga) \
+		$(use_enable vorbis) \
+		$(use_enable oss) \
+		$(use_with qt) \
+		$(use_enable sblive ac3passthrough) \
+		$(use_with sdl) \
+		$(use_enable truetype freetype2) \
+		$(use_enable v4l) \
+		$(use_enable vidix) \
+		$(use_with X x) $(use_enable X xft) \
+		$(use_enable xv) \
+		$(use_enable xvid xvid4) --disable-xvid \
+		$(use_enable zlib libz) \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README
+	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/digest-avifile-0.7.43.20050224-r2 b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r2
new file mode 100644
index 000000000000..b11df39b38be
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r2
@@ -0,0 +1 @@
+MD5 821adfba2606773764aa29fcf14eb51f avifile-0.7-0.7.43.tar.bz2 2980827