Fixing libxml2 issue.

5 files changed, 122 insertions, 8 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 1ac712eef2a4..87439ce71085 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.23 2003/07/19 17:25:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.24 2003/07/21 19:05:05 mholzer Exp $
+
+*avidemux-0.9-r1 (22 Jul 2003)
+
+  22 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9-r1.ebuild,
+  files/avidemux-0.9-libxml2.5.7.patch:
+  Fixing libxml2 issue. Submitted by Marc Hildebrand
+  <marc.hildebrand@t-online.de> in #24545.
 
   19 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
   Readjusted for a mad metapackage Changed to econf.  Added debug and 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 0aa75918a352..106b79eceb8f 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,11 +1,14 @@
-MD5 7eaa7ee74543dd15fbb317d9dc8e5cbf avidemux-2.0.10.ebuild 979
+MD5 b79966435a56c2700dc070e238bda4a1 ChangeLog 5712
+MD5 802671c03849d84892005052d1aa00c9 avidemux-0.9.ebuild 962
 MD5 61c2705af685d031e4bdbe5d3a2b7b80 avidemux-2.0.9.ebuild 981
-MD5 e215748effa6ee031119075625d25f2f avidemux-2.0.10-r1.ebuild 2112
 MD5 f7e294603e071cf1f3eb53c3d4151643 avidemux-2.0.8.ebuild 908
-MD5 802671c03849d84892005052d1aa00c9 avidemux-0.9.ebuild 962
-MD5 0983bded4d65fea4acd2a535b034b27e ChangeLog 5467
-MD5 bb570a68e9c7c6f657c986a9c865e3ea files/digest-avidemux-2.0.10 68
-MD5 bb570a68e9c7c6f657c986a9c865e3ea files/digest-avidemux-2.0.10-r1 68
+MD5 ad3096f00e29acc1c7d4683ced78ab46 avidemux-0.9-r1.ebuild 2015
+MD5 e8911d558556845e375b0580d45f3a09 avidemux-2.0.10-r1.ebuild 2066
+MD5 7eaa7ee74543dd15fbb317d9dc8e5cbf avidemux-2.0.10.ebuild 979
 MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9 62
-MD5 8c05853078d65a252342e76d75f0eaae files/digest-avidemux-2.0.8 67
 MD5 372b9fd9d4c3e49d0ec62fda076cd016 files/digest-avidemux-2.0.9 69
+MD5 bb570a68e9c7c6f657c986a9c865e3ea files/digest-avidemux-2.0.10 68
+MD5 8c05853078d65a252342e76d75f0eaae files/digest-avidemux-2.0.8 67
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
+MD5 bb570a68e9c7c6f657c986a9c865e3ea files/digest-avidemux-2.0.10-r1 68
diff --git a/media-video/avidemux/avidemux-0.9-r1.ebuild b/media-video/avidemux/avidemux-0.9-r1.ebuild
new file mode 100644
index 000000000000..9d9d25773373
--- /dev/null
+++ b/media-video/avidemux/avidemux-0.9-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9-r1.ebuild,v 1.1 2003/07/21 19:05:05 mholzer Exp $
+
+inherit eutils
+
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://fixounet.free.fr/avidemux/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE="debug nls oggvorbis arts truetype alsa"
+
+DEPEND="virtual/x11
+	=x11-libs/gtk+-1.2*
+	>=media-sound/mad-0.14.2b*
+	>=media-libs/a52dec-0.7.4
+	>=media-sound/lame-3.93*
+	>=media-video/mjpegtools-1.6*
+	>=dev-libs/libxml2-2.5.6
+	>=media-libs/xvid-0.9*
+	=media-libs/divx4linux-20020418*
+	nls? ( >=sys-devel/gettext-0.11.2 )
+	oggvorbis? ( >=media-libs/libogg-1.0 
+    		    >=media-libs/libvorbis-1.0 )
+	arts? ( >=kde-base/arts-1.1.1 )
+	truetype? ( >=media-libs/freetype-2.1.2 )
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
+
+
+S=${WORKDIR}/${P}
+
+src_compile() {
+
+	cd ${S}
+
+	#Fixing libxml2 issue
+	if has_version '>=dev-libs/libxml2-2.5.7'
+	then
+		einfo "libxml2 >= 2.5.7 found"
+		epatch ${FILESDIR}/avidemux-0.9-libxml2.5.7.patch
+	else
+		einfo "Old libxml2 found"
+	fi
+
+	# Fixes a possible automake error due to clock skew
+	touch -r *
+	export WANT_AUTOCONF_2_5=1
+	autoconf
+
+	local myconf
+	myconf="--with-gnu-ld --disable-warnings"
+
+	# --enable-profile        creates profiling infos default=no
+  	# --enable-pch            enables precompiled header support 
+	#                         (currently only KCC) default=no
+	# --enable-final          build size optimized apps 
+	#                         (experimental - needs lots of memory)
+	# --disable-closure       don't delay template instantiation
+
+	use debug && myconf="${myconf} --enable-debug=full"
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	econf ${myconf} || die "configure failed"
+
+	make || die "make failed"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog History INSTALL README TODO
+}
diff --git a/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch b/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch
new file mode 100644
index 000000000000..5f0b02063861
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch
@@ -0,0 +1,27 @@
+--- avidemux-0.9/avidemux/prefs.cpp	2003-02-26 19:56:20.000000000 +0000
++++ avidemux-0.9.new/avidemux/prefs.cpp	2003-07-19 14:21:24.000000000 +0000
+@@ -53,8 +53,11 @@
+ // </prefs_gen>
+ 
+ #ifdef USE_LIBXML2
++
++#ifndef LIBXML_THREAD_ENABLED
+ int xmlSaveNoEmptyTags  = 1;      /* save empty tags as <empty></empty> */
+ int xmlIndentTreeOutput = 1;      /* try to indent the tree dumps */
++#endif
+ 
+ void erase_blank_nodes(xmlNodePtr cur){
+   /* erase all blank-nodes recursive; they deny IndentTreeOutput !!! */
+@@ -126,7 +129,12 @@
+ #include "prefs.h"
+ 
+ preferences::preferences(){
++#ifdef LIBXML_THREAD_ENABLED
++   xmlSaveNoEmptyTags;
++   xmlIndentTreeOutput;
++#else
+ 	;
++#endif   
+ }
+ 
+ preferences::~preferences(){
diff --git a/media-video/avidemux/files/digest-avidemux-0.9-r1 b/media-video/avidemux/files/digest-avidemux-0.9-r1
new file mode 100644
index 000000000000..b041f795a427
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-0.9-r1
@@ -0,0 +1 @@
+MD5 ccadde58eb5f00473d7c2ee5d04bca51 avidemux-0.9.tgz 1771162