Now works without avifile !!! and supports subtitles.

4 files changed, 31 insertions, 17 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 65566d343058..5a5dcd7bb06e 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,15 +1,20 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.20 2003/01/19 15:25:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.21 2003/01/19 16:17:05 mholzer Exp $
 
 transcode-0.6.3.20021219 (19 Jan 2003)
 
   19 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.20021219.ebuild files/digest-transcode-0.6.3.20021219 ChangeLog :
-  Version bumped. Now works without avifile !!!. Closes #12471
+  Version bumped. Now works without avifile !!!. Closes #12471.
 
   18 Jan 2003; Martin Holzer <mholzer@gentoo.org> 
   Big commit cause avifile.0.7.25 breaks all transcode packages
 
+*transcode-0.6.3.20021205-r1 (19 Jan 2003)
+
+  19 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.20021205-r1.ebuild files/digest-transcode-0.6.3.20021205-r1 ChangeLog :
+  Now works without avifile !!! and supports subtitles. Closes #12452. 
+
 *transcode-0.6.3.20021205 (11 Dec 2002)
 
   11 Dec 2002; B.Lauwers <blauwers@gentoo.org> Changelog, transcode-0.6.3.20021205.ebuild :
diff --git a/media-video/transcode/files/digest-transcode-0.6.3.20021205 b/media-video/transcode/files/digest-transcode-0.6.3.20021205-r1
index 38b68f2e5051..38b68f2e5051 100644
--- a/media-video/transcode/files/digest-transcode-0.6.3.20021205
+++ b/media-video/transcode/files/digest-transcode-0.6.3.20021205-r1
diff --git a/media-video/transcode/transcode-0.6.3.20021205.ebuild b/media-video/transcode/transcode-0.6.3.20021205-r1.ebuild
index 66e44e8434f8..1cbe39e489b5 100644
--- a/media-video/transcode/transcode-0.6.3.20021205.ebuild
+++ b/media-video/transcode/transcode-0.6.3.20021205-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021205.ebuild,v 1.2 2003/01/19 00:44:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021205-r1.ebuild,v 1.1 2003/01/19 16:17:05 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -24,17 +24,16 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	>=dev-lang/nasm-0.98.34
 	X? ( virtual/x11 )
-	avi? ( <=media-video/avifile-0.7.22
+	avi? (	<=media-video/avifile-0.7.22
 		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
-	<=media-video/avifile-0.7.22
-	>=media-video/avifile-0.7.4
 	media-libs/libdvdread
-	>=media-video/mplayer-0.90_pre10"
+	>=media-video/mplayer-0.90_pre10
+	=media-libs/netpbm-9.12*"
 
 # >=media-video/mplayer-0.90_pre10
 # Most people will want to view their video so
@@ -45,7 +44,6 @@ DEPEND=">=media-libs/a52dec-0.7.3
 # 2002-11-22 Transcode now requires nasm.
 
 # Dont want to build without these currently
-#	avi? ( >=media-video/avifile-0.7.4 )
 #	dvd? ( media-libs/libdvdread )"
 
 src_compile() {
@@ -65,16 +63,16 @@ src_compile() {
 		&& myconf="${myconf} --enable-sse" \
 		|| myconf="${myconf} --disable-sse"
 
-#	use avi \
-#		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
-#		|| myconf="${myconf} --without-avifile-mods --disable-avifile6"
-#
+	use avi \
+		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
+		|| myconf="${myconf} --without-avifile-mods --disable-avifile6"
+
 #	use dvd \
 #		&& myconf="${myconf} --with-dvdread" \
 #		|| myconf="${myconf} --without-dvdread"
 #
 # Dont currently want to build without these
-	myconf="${myconf} --with-dvdread --with-avifile-mods --enable-avifile6"   
+	myconf="${myconf} --with-dvdread"
 
 	use encode \
 		&& myconf="${myconf} --with-lame" \
@@ -100,6 +98,10 @@ src_compile() {
 
 	# Do not use emake !!
 	make all || die
+
+	# subrip stuff
+	cd contrib/subrip
+	make || die
 }
 
 src_install () {
@@ -109,4 +111,11 @@ src_install () {
 		install || die
 
 	dodoc AUTHORS COPYING ChangeLog README TODO
+
+	# subrip stuff
+	cd contrib/subrip
+	dobin pgm2txt srttool subtitle2pgm subtitle2vobsub
+	einfo ""
+	einfo "This ebuild uses subtitles !!!"
+	einfo ""
 }
diff --git a/media-video/transcode/transcode-0.6.3.20021219.ebuild b/media-video/transcode/transcode-0.6.3.20021219.ebuild
index d50e8e79b33b..07635e082a0a 100644
--- a/media-video/transcode/transcode-0.6.3.20021219.ebuild
+++ b/media-video/transcode/transcode-0.6.3.20021219.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021219.ebuild,v 1.1 2003/01/19 15:25:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021219.ebuild,v 1.2 2003/01/19 16:17:05 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -24,13 +24,14 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	>=dev-lang/nasm-0.98.34
 	X? ( virtual/x11 )
-	avi? ( <=media-video/avifile-0.7.22
-	>=media-video/avifile-0.7.4 )
+	avi? (	<=media-video/avifile-0.7.22
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	media-libs/libdvdread
 	>=media-video/mplayer-0.90_pre10
 	=media-libs/netpbm-9.12*"
 
@@ -124,4 +125,3 @@ src_install () {
 	einfo "This ebuild uses subtitles !!!"
 	einfo ""
 }
-