Version bump + libmpeg2 patch

6 files changed, 230 insertions, 9 deletions

diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog
index 41336cc80080..9fe0c1aa6015 100644
--- a/media-video/drip/ChangeLog
+++ b/media-video/drip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/drip
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.12 2003/05/07 18:28:01 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.13 2003/07/06 08:38:40 raker Exp $
+
+*drip-0.9.0_rc1 (06 Jul 2003)
+
+  06 Jul 2003; Nick Hadaway <raker@gentoo.org> drip-0.9.0_rc1.ebuild,
+  libmpeg2.patch:
+  Version bump and now including a patch for the newer incompatible
+  libmpeg2 library.
 
 *drip-0.9.0_alpha3 (27 Apr 2003)
 
diff --git a/media-video/drip/Manifest b/media-video/drip/Manifest
index d608a7b66e62..9187b576d80e 100644
--- a/media-video/drip/Manifest
+++ b/media-video/drip/Manifest
@@ -1,12 +1,15 @@
-MD5 745240037d4f7c77caac72496e4bae1c ChangeLog 2471
-MD5 e1b8d72f195ec1a8a327622d77f8ca46 drip-0.8.1-r5.ebuild 3118
+MD5 7179ae769ba360225e1460a22c92c48d drip-0.9.0_rc1.ebuild 2477
 MD5 b4245e90968cd364cba5d03c0c1d9941 drip-0.8.2_pre1.ebuild 2560
-MD5 c6a29702d259c8e42baee4e31e4109ec drip-0.9.0_alpha3.ebuild 2320
-MD5 39f83fd93ac2e8bb8b9b89afcbcaedcd files/digest-drip-0.8.1-r5 62
+MD5 e1b8d72f195ec1a8a327622d77f8ca46 drip-0.8.1-r5.ebuild 3118
+MD5 1f9e814ea04cccc6d9421831efcf4157 drip-0.9.0_alpha3.ebuild 2402
+MD5 16a74130e1cfe32d2a5f29e453a69408 ChangeLog 2679
 MD5 da7ca55731988f1a5a0ece5cbcbf0de1 files/digest-drip-0.8.2_pre1 66
 MD5 636fd81a0bb66385faca9b7c72cb1cbc files/drip-0.8.1-fix-dvd-symlink.patch 1305
-MD5 e85fdab29910541239d107476ff1a592 files/drip-0.8.1-gcc-3.1.patch 546
 MD5 030a52bd54594455f9d77f959575036d files/drip-0.8.1-missing-stdio.patch 567
-MD5 89536060720610232d7c3306761d93eb files/drip.desktop 119
-MD5 c0b2dc8cb5d74a89921e18556161dcbb files/dripgetdvd.sh 1348
+MD5 27ca218152ac3b83a6f59a84c7a7f539 files/libmpeg2.patch 3677
+MD5 e85fdab29910541239d107476ff1a592 files/drip-0.8.1-gcc-3.1.patch 546
+MD5 39f83fd93ac2e8bb8b9b89afcbcaedcd files/digest-drip-0.8.1-r5 62
+MD5 6ae51a54ca05edca6f931b33c8a24a0c files/digest-drip-0.9.0_rc1 66
 MD5 23432e9d253629f04e963b5f9ad807c9 files/digest-drip-0.9.0_alpha3 66
+MD5 c0b2dc8cb5d74a89921e18556161dcbb files/dripgetdvd.sh 1348
+MD5 89536060720610232d7c3306761d93eb files/drip.desktop 119
diff --git a/media-video/drip/drip-0.9.0_alpha3.ebuild b/media-video/drip/drip-0.9.0_alpha3.ebuild
index 7a01736c061f..a111d41d8368 100644
--- a/media-video/drip/drip-0.9.0_alpha3.ebuild
+++ b/media-video/drip/drip-0.9.0_alpha3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0_alpha3.ebuild,v 1.2 2003/05/07 18:28:01 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0_alpha3.ebuild,v 1.3 2003/07/06 08:38:40 raker Exp $
 
 inherit eutils libtool
 
@@ -42,6 +42,9 @@ src_unpack() {
 	# <azarah@gentoo.org>
 	cd ${S} ; epatch ${FILESDIR}/${PN}-0.8.1-fix-dvd-symlink.patch
 
+	# patch for changing types in >libmpeg-0.3.1
+	epatch ${FILESDIR}/libmpeg2.patch
+
 	# Remove stale script ... "automake --add-missing" will add it again
 	einfo "Rerunnig autoconf/automake..."
 	cd ${S} ; rm -f ${S}/missing
diff --git a/media-video/drip/drip-0.9.0_rc1.ebuild b/media-video/drip/drip-0.9.0_rc1.ebuild
new file mode 100644
index 000000000000..b3366454e707
--- /dev/null
+++ b/media-video/drip/drip-0.9.0_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0_rc1.ebuild,v 1.1 2003/07/06 08:38:40 raker Exp $
+
+inherit eutils libtool
+
+MY_P="${P/_}"
+MY_P="${MY_P/rc1/-RC1}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Drip - A DVD to DIVX convertor frontend"
+SRC_URI="http://drip.sourceforge.net/files/${MY_P}.tar.gz"
+HOMEPAGE="http://drip.sourceforge.net/"
+
+RDEPEND="gnome-base/gnome-libs
+	>=media-video/avifile-0.7.22
+	>=media-libs/a52dec-0.7.3
+	>=media-libs/divx4linux-20020418
+	>=media-libs/libdvdcss-1.2.2
+	>=media-libs/libdvdread-0.9.3
+	>=media-libs/libmpeg2-0.3.1
+	media-gfx/imagemagick
+	media-libs/gdk-pixbuf
+	dev-libs/libxml2
+	sys-apps/eject"
+	
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	>=sys-devel/automake-1.5-r1"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Fix the problem that if the /dev/dvd symlink is not absolute,
+	# drip fails to start.  We do this by tring to figure what the
+	# absolute path to the block device of a dvd drive is with help
+	# from the dripgetdvd.sh script.
+	# <azarah@gentoo.org>
+	cd ${S} ; epatch ${FILESDIR}/${PN}-0.8.1-fix-dvd-symlink.patch
+
+	# patch for changing types in >libmpeg-0.3.1
+	if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then
+		epatch ${FILESDIR}/libmpeg2.patch
+	fi
+
+	# Remove stale script ... "automake --add-missing" will add it again
+	einfo "Rerunnig autoconf/automake..."
+	cd ${S} ; rm -f ${S}/missing
+	export WANT_AUTOMAKE_1_5=1
+	aclocal -I macros
+	automake --add-missing
+	autoconf
+}
+
+src_compile() {
+
+	elibtoolize
+
+	local myconf=
+	
+	use nls || myconf="${myconf} --disable-nls"
+
+	# Do not use custom CFLAGS !!!
+	unset CFLAGS CXXFLAGS
+	
+	econf ${myconf} || die
+			
+	make || die
+}
+
+src_install() {
+	
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		localstatedir=${D}/var/lib \
+		sysconfdir=${D}/etc \
+		drip_helpdir=${D}/usr/share/gnome/help/drip/C \
+		drip_pixmapdir=${D}/usr/share/pixmaps \
+		pixdir=${D}/usr/share/pixmaps/drip \
+		install || die
+
+	# Custom script for drip to get the *real* dvd device
+	# It is a bit rough around the edges, but hopefully will do the trick.
+	dobin ${FILESDIR}/dripgetdvd.sh
+
+	insinto /usr/share/pixmaps
+	newins ${S}/pixmaps/drip_logo.jpg drip.jpg
+	insinto /usr/share/gnome/apps/Multimedia
+	doins ${FILESDIR}/drip.desktop
+
+	dodoc AUTHORS BUG-REPORT.TXT COPYING ChangeLog NEWS README TODO
+}
+
diff --git a/media-video/drip/files/digest-drip-0.9.0_rc1 b/media-video/drip/files/digest-drip-0.9.0_rc1
new file mode 100644
index 000000000000..a7bf61fa932d
--- /dev/null
+++ b/media-video/drip/files/digest-drip-0.9.0_rc1
@@ -0,0 +1 @@
+MD5 1bc27dbb4080da18e6153253a5087156 drip-0.9.0-RC1.tar.gz 716775
diff --git a/media-video/drip/files/libmpeg2.patch b/media-video/drip/files/libmpeg2.patch
new file mode 100644
index 000000000000..ed89dd613f1a
--- /dev/null
+++ b/media-video/drip/files/libmpeg2.patch
@@ -0,0 +1,109 @@
+diff -urN drip/encoder/mpeg2_internal.h drip-modified/encoder/mpeg2_internal.h
+--- drip/encoder/mpeg2_internal.h	2003-03-20 06:01:05.000000000 -0600
++++ drip-modified/encoder/mpeg2_internal.h	2003-07-02 11:32:28.000000000 -0500
+@@ -1,6 +1,6 @@
+ /*
+  * mpeg2_internal.h
+- * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
++ * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
+  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+  *
+  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
+@@ -54,7 +54,7 @@
+     int f_code[2];
+ } motion_t;
+ 
+-struct decoder_s {
++struct mpeg2_decoder_s {
+     /* first, state that carries information from one macroblock to the */
+     /* next inside a slice, and is never used outside of mpeg2_slice() */
+ 
+@@ -138,18 +138,18 @@
+ };
+ 
+ typedef struct {
+-    fbuf_t fbuf;
++    mpeg2_fbuf_t fbuf;
+ } fbuf_alloc_t;
+ 
+ struct mpeg2dec_s {
+-    decoder_t decoder;
++    mpeg2_decoder_t decoder;
+ 
+     mpeg2_info_t info;
+ 
+     uint32_t shift;
+     int is_display_initialized;
+-    int (* action) (struct mpeg2dec_s * mpeg2dec);
+-    int state;
++    mpeg2_state_t (* action) (struct mpeg2dec_s * mpeg2dec);
++    mpeg2_state_t state;
+     uint32_t ext_state;
+ 
+     /* allocated in init - gcc has problems allocating such big structures */
+@@ -172,11 +172,12 @@
+     uint8_t first_decode_slice;
+     uint8_t nb_decode_slices;
+ 
+-    sequence_t new_sequence;
+-    sequence_t sequence;
+-    picture_t pictures[4];
+-    picture_t * picture;
+-    /*const*/ fbuf_t * fbuf[3];	/* 0: current fbuf, 1-2: prediction fbufs */
++    mpeg2_sequence_t new_sequence;
++    mpeg2_sequence_t sequence;
++    mpeg2_gop_t gop;
++    mpeg2_picture_t pictures[4];
++    mpeg2_picture_t * picture;
++    /*const*/ mpeg2_fbuf_t * fbuf[3];	/* 0: current fbuf, 1-2: prediction fbufs */
+ 
+     fbuf_alloc_t fbuf_alloc[3];
+     int custom_fbuf;
+@@ -193,6 +194,10 @@
+     uint8_t * buf_end;
+ 
+     int16_t display_offset_x, display_offset_y;
++
++    int copy_matrix;
++    uint8_t intra_quantizer_matrix [64];
++    uint8_t non_intra_quantizer_matrix [64];
+ };
+ 
+ typedef struct {
+@@ -218,21 +223,21 @@
+ void mpeg2_cpu_state_init (uint32_t accel);
+ 
+ /* decode.c */
+-int mpeg2_seek_sequence (mpeg2dec_t * mpeg2dec);
+-int mpeg2_seek_header (mpeg2dec_t * mpeg2dec);
+-int mpeg2_parse_header (mpeg2dec_t * mpeg2dec);
++mpeg2_state_t mpeg2_seek_sequence (mpeg2dec_t * mpeg2dec);
++mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec);
+ 
+ /* header.c */
+ void mpeg2_header_state_init (mpeg2dec_t * mpeg2dec);
+ int mpeg2_header_sequence (mpeg2dec_t * mpeg2dec);
+ int mpeg2_header_gop (mpeg2dec_t * mpeg2dec);
+-int mpeg2_header_picture_start (mpeg2dec_t * mpeg2dec);
++mpeg2_state_t mpeg2_header_picture_start (mpeg2dec_t * mpeg2dec);
+ int mpeg2_header_picture (mpeg2dec_t * mpeg2dec);
+ int mpeg2_header_extension (mpeg2dec_t * mpeg2dec);
+ int mpeg2_header_user_data (mpeg2dec_t * mpeg2dec);
++void mpeg2_header_matrix_finalize (mpeg2dec_t * mpeg2dec);
+ void mpeg2_header_sequence_finalize (mpeg2dec_t * mpeg2dec);
+-int mpeg2_header_slice_start (mpeg2dec_t * mpeg2dec);
+-int mpeg2_header_end (mpeg2dec_t * mpeg2dec);
++mpeg2_state_t mpeg2_header_slice_start (mpeg2dec_t * mpeg2dec);
++mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec);
+ void mpeg2_set_fbuf (mpeg2dec_t * mpeg2dec, int coding_type);
+ 
+ /* idct.c */
+@@ -268,7 +273,7 @@
+ void mpeg2_idct_copy_alpha (int16_t * block, uint8_t * dest, int stride);
+ void mpeg2_idct_add_alpha (int last, int16_t * block,
+ 			   uint8_t * dest, int stride);
+-void mpeg2_idct_alpha_init(int no_mvi);
++void mpeg2_idct_alpha_init (void);
+ 
+ /* motion_comp.c */
+ void mpeg2_mc_init (uint32_t accel);