diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-30 19:05:30 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-30 19:05:30 +0000 |
commit | 614eb0821c80b4ffc5b75dfe7592c8104b97cdc0 (patch) | |
tree | eb4b0d02c7579a7b3f6beacdec5153601c974157 /media-video | |
parent | Marked ~ppc-macos (bug #110826) (diff) | |
download | historical-614eb0821c80b4ffc5b75dfe7592c8104b97cdc0.tar.gz historical-614eb0821c80b4ffc5b75dfe7592c8104b97cdc0.tar.bz2 historical-614eb0821c80b4ffc5b75dfe7592c8104b97cdc0.zip |
Remove drip-0.8.1-r5 as it depends forcefully on divx4linux.
Package-Manager: portage-2.0.53_rc6
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/drip/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/drip/Manifest | 25 | ||||
-rw-r--r-- | media-video/drip/drip-0.8.1-r5.ebuild | 120 | ||||
-rw-r--r-- | media-video/drip/drip-0.9.0.ebuild | 23 | ||||
-rw-r--r-- | media-video/drip/files/digest-drip-0.8.1-r5 | 1 | ||||
-rw-r--r-- | media-video/drip/files/drip-0.8.1-gcc-3.1.patch | 12 | ||||
-rw-r--r-- | media-video/drip/files/drip-0.8.1-missing-stdio.patch | 20 | ||||
-rw-r--r-- | media-video/drip/files/libmpeg2.patch | 109 |
8 files changed, 21 insertions, 296 deletions
diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog index 92005607c087..a3930f919c83 100644 --- a/media-video/drip/ChangeLog +++ b/media-video/drip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/drip # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.22 2005/09/03 23:24:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.23 2005/10/30 19:05:29 flameeyes Exp $ + + 30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> -files/libmpeg2.patch, + -files/drip-0.8.1-gcc-3.1.patch, -files/drip-0.8.1-missing-stdio.patch, + -drip-0.8.1-r5.ebuild, drip-0.9.0.ebuild: + Remove drip-0.8.1-r5 as it depends forcefully on divx4linux. 03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> drip-0.8.1-r5.ebuild, drip-0.9.0.ebuild: diff --git a/media-video/drip/Manifest b/media-video/drip/Manifest index d3b41a24ec5a..96afbcd2606f 100644 --- a/media-video/drip/Manifest +++ b/media-video/drip/Manifest @@ -1,24 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 dcf86aa613698a2e609b41dbe358e6a5 ChangeLog 4001 -MD5 ae71062ecbc324d934945c5aa4a5d1ef drip-0.8.1-r5.ebuild 3065 -MD5 38def2752792eb291c10bce511a1b7a3 drip-0.9.0.ebuild 2753 -MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -MD5 062194efdad2b8a1e02ded8b66d86fc3 files/drip.desktop 154 -MD5 39f83fd93ac2e8bb8b9b89afcbcaedcd files/digest-drip-0.8.1-r5 62 -MD5 a7d5edb693cf81b8e5fbc833cf221516 files/dripgetdvd.sh 1330 -MD5 6a8907bd9031fcf440cba36e784faff6 files/drip-0.9.0-gcc34.patch 2795 -MD5 030a52bd54594455f9d77f959575036d files/drip-0.8.1-missing-stdio.patch 567 -MD5 27ca218152ac3b83a6f59a84c7a7f539 files/libmpeg2.patch 3677 -MD5 636fd81a0bb66385faca9b7c72cb1cbc files/drip-0.8.1-fix-dvd-symlink.patch 1305 +MD5 ce00f680adef8a922fdad4bda08731d5 ChangeLog 4259 +MD5 28a9ebf090e405a28fbeeaacac3fd3af drip-0.9.0.ebuild 2486 MD5 7f9daf1e0ac3dae373c1c892c46d1476 files/digest-drip-0.9.0 137 +MD5 636fd81a0bb66385faca9b7c72cb1cbc files/drip-0.8.1-fix-dvd-symlink.patch 1305 MD5 5a5df6046a26634c3fc453c01d52db4b files/drip-0.9.0-cflags.patch 712 -MD5 e85fdab29910541239d107476ff1a592 files/drip-0.8.1-gcc-3.1.patch 546 +MD5 6a8907bd9031fcf440cba36e784faff6 files/drip-0.9.0-gcc34.patch 2795 +MD5 062194efdad2b8a1e02ded8b66d86fc3 files/drip.desktop 154 +MD5 a7d5edb693cf81b8e5fbc833cf221516 files/dripgetdvd.sh 1330 +MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDGjC2j5H05b2HAEkRAu1qAKCQHiY4ZfnUOMoJDXe0Mrroq1pZHQCePYSB -CtO8/yDw0dhoeaOLjIlcv6A= -=UNeJ +iD8DBQFDZRmHj5H05b2HAEkRAkHKAJ9MG1lOmLNWvI1QwbQym/Qkyiy01gCfYIQx +7AjWkCQmuy47snMuzfM080c= +=Jw+a -----END PGP SIGNATURE----- diff --git a/media-video/drip/drip-0.8.1-r5.ebuild b/media-video/drip/drip-0.8.1-r5.ebuild deleted file mode 100644 index 4c4cf3254945..000000000000 --- a/media-video/drip/drip-0.8.1-r5.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r5.ebuild,v 1.12 2005/09/03 23:24:23 flameeyes Exp $ - -DESCRIPTION="A DVD to DIVX convertor frontend" -HOMEPAGE="http://drip.sourceforge.net/" -SRC_URI="http://drip.sourceforge.net/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="nls" - -RDEPEND="gnome-base/gnome-libs - >=media-video/avifile-0.7.4.20020426-r2 - >=media-libs/a52dec-0.7.3 - >=media-libs/divx4linux-20020418 - >=media-libs/libdvdcss-1.1.1 - >=media-libs/libdvdread-0.9.2 - media-libs/gdk-pixbuf" -DEPEND="${RDEPEND} - dev-lang/nasm - >=sys-devel/automake-1.5-r1" - -src_unpack() { - AF_MINOR_VER="$(avifile-config --data-dir | cut -d. -f2)" - unpack ${A} - - cd ${S} - - # Fix the problem that if the /dev/dvd symlink is not absolute, - # drip fails to start. - patch -p1 < ${FILESDIR}/${P}-fix-dvd-symlink.patch || die - - # Fix hardcoded path of plugins - cd ${S} - cp encoder/plugin-loader.cpp encoder/plugin-loader.cpp.orig - sed -e "s:/usr/local/lib:/usr/lib:g" \ - encoder/plugin-loader.cpp.orig >encoder/plugin-loader.cpp - - # Fix missing #include <stdio.h> - patch -p1 < ${FILESDIR}/${P}-missing-stdio.patch || die - - # Fix missing #include <stdio.h> - patch -p1 < ${FILESDIR}/${P}-gcc-3.1.patch || die "Failed gcc-3.1 compatibility patch" - - # Fixup to work with avifile-0.${AF_MINOR_VER} - cd ${S}/encoder - for x in encoder.hh main.hh encoder.cpp external.cpp - do - cp ${x} ${x}.orig - sed -e "s:AVIFILE_MINOR_VERSION==6:AVIFILE_MINOR_VERSION==${AF_MINOR_VER}:g" \ - ${x}.orig >${x} - done - - # Fix it to work with the suffix the new avifile introduces. -# cd ${S} -# for x in $(find . -name 'Makefile.am') configure.in -# do -# cp ${x} ${x}.orig -# sed -e "s:avifile-config:avifile-config0.${AF_MINOR_VER}:g" \ -# ${x}.orig >${x} -# done - - cd ${S} - # Remove stale script ... "automake --add-missing" will add it again - rm -f ${S}/missing - export WANT_AUTOMAKE=1.5 - aclocal -I macros - automake --add-missing - autoconf - elibtoolize -} - -src_compile() { - - export WANT_AUTOMAKE=1.5 - - local myconf - use nls || myconf="--disable-nls" - - CFLAGS= \ - CXXFLAGS= \ - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var/lib \ - --sysconfdir=/etc \ - ${myconf} || die - - emake || 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 \ - install || die - - # Remove liba52.so.* as ac52dec provides this - rm ${D}/usr/lib/liba52* - - dodoc AUTHORS ChangeLog NEWS README TODO - - # 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 -} - diff --git a/media-video/drip/drip-0.9.0.ebuild b/media-video/drip/drip-0.9.0.ebuild index c8c1a2cf9918..9c560f3817ee 100644 --- a/media-video/drip/drip-0.9.0.ebuild +++ b/media-video/drip/drip-0.9.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.7 2005/09/03 23:24:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.8 2005/10/30 19:05:30 flameeyes Exp $ -inherit eutils libtool flag-o-matic +inherit eutils libtool flag-o-matic autotools DESCRIPTION="A DVD to DIVX convertor frontend" HOMEPAGE="http://drip.sourceforge.net/" @@ -14,7 +14,6 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls" - #>=media-libs/divx4linux-20020418 RDEPEND="gnome-base/gnome-libs !ppc? ( >=media-video/avifile-0.7.34 ) >=media-libs/a52dec-0.7.3 @@ -56,25 +55,15 @@ src_unpack() { epatch ${FILESDIR}/${P}-gcc34.patch # 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 - aclocal -I macros - automake --add-missing - autoconf - libtoolize --copy --force + AT_M4DIR="macros" eautoreconf } src_compile() { - local myconf= - - use nls || myconf="${myconf} --disable-nls" - use x86 && append-flags "-DARCH_X86" - econf ${myconf} || die - - make || die + econf $(use_enable nls) || die + emake || die } src_install() { @@ -92,8 +81,6 @@ src_install() { newins ${S}/pixmaps/drip_logo.jpg drip.jpg insinto /usr/share/applications doins ${FILESDIR}/drip.desktop - insinto /usr/share/applnk/Multimedia - doins ${FILESDIR}/drip.desktop dodoc AUTHORS BUG-REPORT.TXT ChangeLog NEWS README TODO } diff --git a/media-video/drip/files/digest-drip-0.8.1-r5 b/media-video/drip/files/digest-drip-0.8.1-r5 deleted file mode 100644 index 53af5b8fffdc..000000000000 --- a/media-video/drip/files/digest-drip-0.8.1-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 b88e9731f7266f0e0b9ff412c13a3624 drip-0.8.1.tar.gz 603487 diff --git a/media-video/drip/files/drip-0.8.1-gcc-3.1.patch b/media-video/drip/files/drip-0.8.1-gcc-3.1.patch deleted file mode 100644 index 3b96401a7db9..000000000000 --- a/media-video/drip/files/drip-0.8.1-gcc-3.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru drip-0.8.1.bad/encoder/pulldown.cpp drip-0.8.1/encoder/pulldown.cpp ---- drip-0.8.1.bad/encoder/pulldown.cpp Sun Mar 24 06:36:36 2002 -+++ drip-0.8.1/encoder/pulldown.cpp Mon Jun 10 11:20:30 2002 -@@ -70,7 +70,7 @@ - bool oddeven; - int framenumOffset; - --int pulldown_init(int width, int height, bool oddfirst = false, int foffset = 0){ -+int pulldown_init(int width, int height, bool oddfirst, int foffset){ - if((framethree = new guchar[width * height * 3]) == NULL) - return -1; - if((outframe = new guchar[width * height * 3]) == NULL) diff --git a/media-video/drip/files/drip-0.8.1-missing-stdio.patch b/media-video/drip/files/drip-0.8.1-missing-stdio.patch deleted file mode 100644 index 8820f183f388..000000000000 --- a/media-video/drip/files/drip-0.8.1-missing-stdio.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- drip-0.8.1/encoder/demuxer.cpp Mon May 27 20:37:12 2002 -+++ drip-0.8.1.azarah/encoder/demuxer.cpp Mon May 27 20:37:33 2002 -@@ -10,6 +10,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <stdio.h> - #include "fast_memcpy.hh" - - ---- drip-0.8.1/encoder/encoder.cpp Mon May 27 20:35:57 2002 -+++ drip-0.8.1.orig/encoder/encoder.cpp Mon May 27 20:39:10 2002 -@@ -15,6 +15,7 @@ - #include <gtk/gtk.h> - #include <unistd.h> - #include <fstream> -+#include <stdio.h> - #include <errno.h> - #include <pthread.h> - #include <gdk-pixbuf/gdk-pixbuf.h> diff --git a/media-video/drip/files/libmpeg2.patch b/media-video/drip/files/libmpeg2.patch deleted file mode 100644 index ed89dd613f1a..000000000000 --- a/media-video/drip/files/libmpeg2.patch +++ /dev/null @@ -1,109 +0,0 @@ -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); |