use upstream patch for sox 14.2.0 compatibility, remove unused version

(Portage version: 2.2_rc15/cvs/Linux 2.6.27.5 x86_64)

3 files changed, 30 insertions, 112 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 5f52ab956309..3d4e9b997fef 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.31 2008/11/13 10:07:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.32 2008/11/23 12:36:51 aballier Exp $
+
+  23 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+  files/mlt-0.3.0-sox1420.patch, -mlt-0.3.0.ebuild:
+  use upstream patch for sox 14.2.0 compatibility, remove unused version
 
 *mlt-0.3.2 (13 Nov 2008)
 
diff --git a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
index 3421ab2b82ef..3eed1c0c9662 100644
--- a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
+++ b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
@@ -1,19 +1,33 @@
-Index: mlt-0.3.0/src/modules/sox/filter_sox.c
+Index: src/modules/sox/filter_sox.c
 ===================================================================
---- mlt-0.3.0.orig/src/modules/sox/filter_sox.c
-+++ mlt-0.3.0/src/modules/sox/filter_sox.c
-@@ -33,9 +33,13 @@
+--- src/modules/sox/filter_sox.c	(revision 1238)
++++ src/modules/sox/filter_sox.c	(revision 1239)
+@@ -35,17 +35,21 @@
  #	define ST_SUCCESS SOX_SUCCESS
  #	define st_sample_t sox_sample_t
  #	define eff_t sox_effect_t*
 -#	define st_size_t sox_size_t
  #	define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
  #	define ST_LIB_VERSION SOX_LIB_VERSION
-+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
-+#	define st_size_t size_t
-+#else
-+#	define st_size_t sox_size_t
-+#endif
++#	if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
++#		define st_size_t size_t
++#	else
++#		define st_size_t sox_size_t
++#	endif
  #	define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
- #if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
- #	define ST_SSIZE_MIN SOX_SAMPLE_MIN
+-#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+-#	define ST_SSIZE_MIN SOX_SAMPLE_MIN
++#	if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
++#		define ST_SSIZE_MIN SOX_SAMPLE_MIN
++#	else
++#		define ST_SSIZE_MIN SOX_SSIZE_MIN
++#	endif
++#		define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
+ #else
+-#	define ST_SSIZE_MIN SOX_SSIZE_MIN
+-#endif
+-#	define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
+-#else
+ #	include <st.h>
+ #endif
+ 
diff --git a/media-libs/mlt/mlt-0.3.0.ebuild b/media-libs/mlt/mlt-0.3.0.ebuild
deleted file mode 100644
index 0725ab2d346a..000000000000
--- a/media-libs/mlt/mlt-0.3.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.0.ebuild,v 1.3 2008/11/10 12:09:10 aballier Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="MLT is an open source multimedia framework, designed and developed
-for television broadcasting"
-HOMEPAGE="http://mlt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora
-xine ffmpeg libsamplerate qt3"
-
-DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	dv?	( >=media-libs/libdv-0.104 )
-	xml?	( >=dev-libs/libxml2-2.5 )
-	ogg?	( >=media-libs/libogg-1.1.3 )
-	vorbis?	( >=media-libs/libvorbis-1.1.2 )
-	sdl?	( >=media-libs/libsdl-1.2.10
-		  >=media-libs/sdl-image-1.2.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	jack?	( media-sound/jack-audio-connection-kit
-			  media-libs/ladspa-sdk
-			  >=dev-libs/libxml2-2.5 )
-	gtk?	( >=x11-libs/gtk+-2
-		  x11-libs/pango )
-	sox? ( media-sound/sox )
-	quicktime? ( media-libs/libquicktime )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	lame? ( >=media-sound/lame-3.97_beta2 )
-	qt3? ( x11-libs/qt:3 )
-	theora? ( >=media-libs/libtheora-1.0_alpha5 )"
-RDEPEND=${DEPEND}
-
-pkg_setup() {
-	local fail="USE sox needs also USE libsamplerate enabled."
-
-	if use sox && ! use libsamplerate; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/mlt-0.2.2-motion-est-nonx86.patch
-	epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch
-	epatch "${FILESDIR}"/${P}-sox1410.patch
-	epatch "${FILESDIR}"/${P}-avcodec.patch
-	epatch "${FILESDIR}"/${P}-sox1420.patch
-}
-
-src_compile() {
-	tc-export CC
-
-	local myconf="	--enable-gpl --enable-shared
-			--enable-pp --enable-shared-pp
-			--enable-motion-est
-			$(use_enable dv)
-			$(use_enable mmx)
-			$(use_enable gtk gtk2)
-			$(use_enable vorbis)
-			$(use_enable ogg)
-			$(use_enable sdl)
-			$(use_enable jack jackrack)
-			$(use_enable sox)
-			$(use_enable theora)
-			$(use_enable lame mp3lame)
-			$(use_enable ffmpeg avformat)
-			$(use_enable libsamplerate resample)
-			$(use_enable qt3 qimage)
-			$(use_enable xml westley)
-			$(use_enable xine)"
-
-	use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" &&
-		myconf="${myconf} --avformat-swscale"
-
-	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
-
-	econf ${myconf} || die "econf failed"
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc docs/*.txt ChangeLog README docs/TODO
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-}