From cd0d6fa154b4a5258ab7f79b1e76449e307d4fbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 11 Nov 2005 21:09:18 +0000 Subject: [PATCH] Remove drip as intended. --- media-video/drip/ChangeLog | 121 ------------------ media-video/drip/Manifest | 19 --- media-video/drip/drip-0.9.0.ebuild | 86 ------------- media-video/drip/files/digest-drip-0.9.0 | 2 - .../files/drip-0.8.1-fix-dvd-symlink.patch | 29 ----- .../drip/files/drip-0.9.0-cflags.patch | 12 -- media-video/drip/files/drip-0.9.0-gcc34.patch | 58 --------- media-video/drip/files/drip.desktop | 8 -- media-video/drip/files/dripgetdvd.sh | 74 ----------- media-video/drip/metadata.xml | 5 - 10 files changed, 414 deletions(-) delete mode 100644 media-video/drip/ChangeLog delete mode 100644 media-video/drip/Manifest delete mode 100644 media-video/drip/drip-0.9.0.ebuild delete mode 100644 media-video/drip/files/digest-drip-0.9.0 delete mode 100644 media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch delete mode 100644 media-video/drip/files/drip-0.9.0-cflags.patch delete mode 100644 media-video/drip/files/drip-0.9.0-gcc34.patch delete mode 100644 media-video/drip/files/drip.desktop delete mode 100644 media-video/drip/files/dripgetdvd.sh delete mode 100644 media-video/drip/metadata.xml diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog deleted file mode 100644 index a3930f919c83..000000000000 --- a/media-video/drip/ChangeLog +++ /dev/null @@ -1,121 +0,0 @@ -# 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.23 2005/10/30 19:05:29 flameeyes Exp $ - - 30 Oct 2005; Diego Pettenò -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ò drip-0.8.1-r5.ebuild, - drip-0.9.0.ebuild: - Don't install COPYING, INSTALL and ABOUT-NLS files. - - 28 Jul 2005; David Holm drip-0.9.0.ebuild: - Added to ~ppc. - - 28 May 2005; Diego Pettenò drip-0.9.0.ebuild: - Moved dependency to virtual/eject. - - 30 Mar 2005; Jan Brinkmann - +files/drip-0.9.0-gcc34.patch, drip-0.9.0.ebuild: - added a patch for version 0.9.0 to enable successful gcc3.4.x compilation. - fixes #67675 - - 13 Mar 2005; Jan Brinkmann drip-0.8.1-r5.ebuild: - added libtoolize call, fixes #80904 - -*drip-0.9.0 (13 Oct 2004) - - 13 Oct 2004; Jeremy Huddleston - +files/drip-0.9.0-cflags.patch, files/drip.desktop, +drip-0.9.0.ebuild, - -drip-0.9.0_alpha3.ebuild, -drip-0.9.0_rc1.ebuild: - Removed pre-release versions. Version bump to 0.9.0. Added debian patch to - fix support for libpeg2-0.4.0b. Honor user CFLAGS. Closes bugs #41880 and - #59513. - - 30 Mar 2004; Michael Sterrett drip-0.8.1-r5.ebuild, - drip-0.9.0_alpha3.ebuild, drip-0.9.0_rc1.ebuild: - AF_MINOR_VER into src_unpack; fix IUSE - - 08 Jul 2003; Nick Hadaway drip-0.9.0_rc1.ebuild: - As of 0.9.0-RC1 gcc2 won't compile drip. require gcc3. - -*drip-0.9.0_rc1 (06 Jul 2003) - - 06 Jul 2003; Nick Hadaway 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) - - 07 May 2003; Jon Portnoy drip-0.9.0_alpha3.ebuild : - Add ImageMagick to deps, fixes bug #20573. - - 27 Apr 2003; Martin Schlemmer drip-0.9.0_alpha3.ebuild, - dripgetdvd.sh : - Update version. Also fix dripgetdvd.sh to be a bit smarter, and a few - bugs while we are at it. This closes bug #19690, although the ebuild - supplied there had a few DEPEND and form issues. Also, it dropped the - dripgetdvd.sh stuff. - -*drip-0.8.2_pre1 (13 Aug 2002) - - 25 Feb 2003; Martin Holzer drip-0.8.2_pre1.ebuild : - Fixed dependencies. Closes #16353. - - 13 Aug 2002; Martin Schlemmer drip-0.8.2_pre1.ebuild : - - New pre version. - -*drip-0.8.1-r5 (10 Jun 2002) - - 10 Jun 2002; Brandon Low drip-0.8.1-r5.ebuild : - - Fix compile on gcc-3.1 (1-line patch). - -*drip-0.8.1-r4 (27 May 2002) - - 27 May 2002; M.Schlemmer drip-0.8.1-r4.ebuild : - - Resolve bug #3052. Seems the older divx4linux headers included - stdio.h, and I missed it due to multiple versions on my system. - - Also fix the startup problem if /dev/dvd are not an absolute - symlink. - -*drip-0.8.1-r3 (26 May 2002) - - 26 May 2002; M.Schlemmer drip-0.8.1-r3.ebuild : - - Make it depend on latest avifile, and remove the patches for - the suffix that was added to avifile-config. - -*drip-0.8.1-r2 (19 May 2002) - - 19 May 2002; M.Schlemmer drip-0.8.1-r2.ebuild : - - Should compile with avifile-0.7.4 now. - -*drip-0.8.1-r1 (6 Apr 2002) - - 6 Apr 2002; M.Schlemmer drip-0.8.1-r1.ebuild : - - Fix reference to invalid lib path. - -*drip-0.8.1 (29 Mar 2002) - - 29 Mar 2002; Seemant Kulleen drip-0.8.1.ebuild : - - Version bump. - -*drip-0.8.0 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/media-video/drip/Manifest b/media-video/drip/Manifest deleted file mode 100644 index 96afbcd2606f..000000000000 --- a/media-video/drip/Manifest +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -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 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) - -iD8DBQFDZRmHj5H05b2HAEkRAkHKAJ9MG1lOmLNWvI1QwbQym/Qkyiy01gCfYIQx -7AjWkCQmuy47snMuzfM080c= -=Jw+a ------END PGP SIGNATURE----- diff --git a/media-video/drip/drip-0.9.0.ebuild b/media-video/drip/drip-0.9.0.ebuild deleted file mode 100644 index 9c560f3817ee..000000000000 --- a/media-video/drip/drip-0.9.0.ebuild +++ /dev/null @@ -1,86 +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.9.0.ebuild,v 1.8 2005/10/30 19:05:30 flameeyes Exp $ - -inherit eutils libtool flag-o-matic autotools - -DESCRIPTION="A DVD to DIVX convertor frontend" -HOMEPAGE="http://drip.sourceforge.net/" -SRC_URI="http://drip.sourceforge.net/files/${P}.tar.gz - mirror://debian/pool/main/d/drip/drip_0.8.3.2+0.9.0-rc3-5.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="nls" - -RDEPEND="gnome-base/gnome-libs - !ppc? ( >=media-video/avifile-0.7.34 ) - >=media-libs/a52dec-0.7.3 - >=media-libs/libdvdcss-1.2.2 - >=media-libs/libdvdread-0.9.3 - >=media-libs/libmpeg2-0.4.0 - >=media-libs/xvid-0.9.2 - media-gfx/imagemagick - media-libs/gdk-pixbuf - dev-libs/libxml2 - virtual/eject - >=sys-devel/gcc-3" -DEPEND="${RDEPEND} - !ppc? ( dev-lang/nasm ) - >=sys-devel/automake-1.5-r1" - -src_unpack() { - unpack ${A} - - cd ${S} - - # Many thanks to the Debian devs. Fixes libmpeg2-0.4.0 support. - epatch ${WORKDIR}/drip_0.8.3.2+0.9.0-rc3-5.diff - epatch ${S}/drip-0.8.3.2+0.9.0-rc3/debian/patches/magickfilter_ftbfs.diff - epatch ${S}/drip-0.8.3.2+0.9.0-rc3/debian/patches/mpeg2_api.diff - epatch ${S}/drip-0.8.3.2+0.9.0-rc3/debian/patches/noopt.diff - - # 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. - # - epatch ${FILESDIR}/${PN}-0.8.1-fix-dvd-symlink.patch - - # Honor user CFLAGS - epatch ${FILESDIR}/${P}-cflags.patch - - # enable gcc3.4.x compilation - epatch ${FILESDIR}/${P}-gcc34.patch - - # Remove stale script ... "automake --add-missing" will add it again - export WANT_AUTOMAKE=1.5 - AT_M4DIR="macros" eautoreconf -} - -src_compile() { - use x86 && append-flags "-DARCH_X86" - - econf $(use_enable nls) || die - emake || die -} - -src_install() { - einstall \ - drip_helpdir=${D}/usr/share/gnome/help/drip/C \ - drip_pixmapdir=${D}/usr/share/pixmaps \ - pixdir=${D}/usr/share/pixmaps/drip \ - || 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/applications - doins ${FILESDIR}/drip.desktop - - dodoc AUTHORS BUG-REPORT.TXT ChangeLog NEWS README TODO -} diff --git a/media-video/drip/files/digest-drip-0.9.0 b/media-video/drip/files/digest-drip-0.9.0 deleted file mode 100644 index c5ed7ddd6e08..000000000000 --- a/media-video/drip/files/digest-drip-0.9.0 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a5a07b7646ad25a5c39d3cfd7bbab631 drip-0.9.0.tar.gz 821391 -MD5 b5cf583f7387480ae00ab2bc2076d943 drip_0.8.3.2+0.9.0-rc3-5.diff.gz 5242 diff --git a/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch b/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch deleted file mode 100644 index d6a8627578f0..000000000000 --- a/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- drip-0.8.1/src/main.c Mon May 27 21:36:47 2002 -+++ drip-0.8.1.azarah/src/main.c Mon May 27 21:39:54 2002 -@@ -231,10 +231,14 @@ - device = g_string_new(""); - - /* Look for a device in mtab */ -- device = drip_system("grep dvd /etc/fstab | awk '{print $1}'",&result,FALSE,TRUE); -+ device = drip_system("/usr/bin/dripgetdvd.sh dvd",&result,FALSE,TRUE); - if (device->len==0 || strstr(device->str,"{empty output}")!=NULL) { -- /* Couldn't find anything. Safe default */ -- g_string_sprintf(device,"%s","/dev/cdrom"); -+ /* Couldn't find anything related to dvd, trying cdrom */ -+ device = drip_system("/usr/bin/dripgetdvd.sh cdrom",&result,FALSE,TRUE); -+ if (device->len==0 || strstr(device->str,"{empty output}")!=NULL) { -+ /* Nothing we can do to stop failure, set default */ -+ g_string_sprintf(device,"%s","/dev/cdrom"); -+ } - } - return device->str; - } -@@ -591,7 +595,7 @@ - if (config_ok == FALSE) { - /* Default divx related settings */ - g_log(DRIP_LD,G_LOG_LEVEL_INFO,"Setting up default configuration..."); -- g_string_sprintf(Config.DVDdevice,"%s","/dev/cdrom"); -+ g_string_sprintf(Config.DVDdevice,"%s",detect_dvdrom()); - /* Traceback if Config.DVDdevice is a symbolic link */ - DVDsymlink(); - diff --git a/media-video/drip/files/drip-0.9.0-cflags.patch b/media-video/drip/files/drip-0.9.0-cflags.patch deleted file mode 100644 index fa9de6ce80a8..000000000000 --- a/media-video/drip/files/drip-0.9.0-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur drip-0.9.0.orig/Makefile.am drip-0.9.0/Makefile.am ---- drip-0.9.0.orig/Makefile.am 2004-04-20 13:58:33.000000000 -0700 -+++ drip-0.9.0/Makefile.am 2004-10-13 11:21:24.670588437 -0700 -@@ -2,7 +2,7 @@ - - SUBDIRS = libspu encoder src plug-ins macros doc scripts pixmaps #libvcd - drip_pixmapdir = $(DESTDIR)/`$(GNOME_CONFIG) --prefix`/share/pixmaps --export COMPILE_OPTIM=-DARCH_X86 -funroll-all-loops -ffast-math -fexpensive-optimizations -fschedule-insns2 -Wno-deprecated -fomit-frame-pointer -march=athlon -mcpu=athlon -+export COMPILE_OPTIM=@CFLAGS@ - export COMPILE_DEBUG=-D_REENTRANT -g -ggdb -Wno-deprecated $(MMX_CFLAGS) $(_3DNOW_CFLAGS) $(SSE_CFLAGS) #-DDEBUG - export L_DEBUG=-DNONE - EXTRA_DIST = \ diff --git a/media-video/drip/files/drip-0.9.0-gcc34.patch b/media-video/drip/files/drip-0.9.0-gcc34.patch deleted file mode 100644 index d99bccab6f40..000000000000 --- a/media-video/drip/files/drip-0.9.0-gcc34.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -uprN encoder.orig/encoder.cpp encoder/encoder.cpp ---- encoder.orig/encoder.cpp 2005-03-30 22:51:40.909946272 +0200 -+++ encoder/encoder.cpp 2005-03-30 23:00:48.853646168 +0200 -@@ -762,7 +762,7 @@ void allocate_buffers(void) { - framebuffer = (guchar*)malloc(Config.in_width*Config.in_height*3); - /* Allocate video buffers */ - extrabuffer = (guchar*)malloc(Config.in_width*BYTES_PER_COLOUR_OUTPOUT+4); -- rowptr = new (guchar*)[Config.in_height]; -+ rowptr = new guchar*[Config.in_height]; - for (gint i=0; icdescription = g_string_new(list[codec_nr]->ctype->str); - list[codec_nr]->cdescription = g_string_append(list[codec_nr]->cdescription,": "); - list[codec_nr]->cdescription = g_string_append(list[codec_nr]->cdescription,it->GetName()); -- list[codec_nr]->cav = (enum codecT)0; -+ list[codec_nr]->cav = (codecT)0; - list[codec_nr]->ci = (gpointer)it; - codec_nr++; - #ifndef STANDALONE -@@ -248,7 +248,7 @@ extern "C" { - list[codec_nr]->ccodec = *ia; - list[codec_nr]->cmodule = g_string_new(it->privatename.c_str()); - list[codec_nr]->cdescription = g_string_new(it->GetName()); -- list[codec_nr]->cav = (enum codecT)1; -+ list[codec_nr]->cav = (codecT)1; - list[codec_nr]->ci = (gpointer)it; - codec_nr++; - #ifndef STANDALONE -diff -uprN encoder.orig/fast_memcpy.cpp encoder/fast_memcpy.cpp ---- encoder.orig/fast_memcpy.cpp 2005-03-30 22:51:40.910946120 +0200 -+++ encoder/fast_memcpy.cpp 2005-03-30 22:58:27.649112520 +0200 -@@ -188,8 +188,8 @@ inline void *_fast_memcpy(void *to, cons - MOVNTQ" %%mm6, 48(%1)\n" - MOVNTQ" %%mm7, 56(%1)\n" - : : "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = ((const unsigned char *)from) + 64; -+ to = ((unsigned char *)to) + 64; - } - - // printf(" %d %d\n", (int)from&1023, (int)to&1023); -@@ -277,8 +277,8 @@ inline void *_fast_memcpy(void *to, cons - MOVNTQ" %%mm6, 48(%1)\n" - MOVNTQ" %%mm7, 56(%1)\n" - : : "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = ((const unsigned char *)from) + 64; -+ to = ((unsigned char *)to) + 64; - } - - #endif /* Have SSE */ diff --git a/media-video/drip/files/drip.desktop b/media-video/drip/files/drip.desktop deleted file mode 100644 index 9445535cc060..000000000000 --- a/media-video/drip/files/drip.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Drip -Comment=A DVD to DIVX convertor frontend -Exec=drip -Icon=drip.jpg -Terminal=0 -Type=Application -Categories=Application;AudioVideo; diff --git a/media-video/drip/files/dripgetdvd.sh b/media-video/drip/files/dripgetdvd.sh deleted file mode 100644 index dc126c1079d6..000000000000 --- a/media-video/drip/files/dripgetdvd.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Author: Martin Schlemmer -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/files/dripgetdvd.sh,v 1.4 2004/07/14 22:57:53 agriffis Exp $ - -# This basically resolves a symlink in /dev to the block device node. If -# $1 is a absolute path, and that do not exist, we also check /etc/fstab -# if there is an entry, if not we check for an entry of `basename $1`. - -if test -z "$1" -then - exit 1 -fi - -DVD="$1" - -check_device() { - local DVD="$1" - local NEWDVD= - - while test -L "${DVD}" - do - NEWDVD="$(readlink "${DVD}")" - - if test -z "$(echo "${NEWDVD}" | grep -e "^/dev")" - then - DVD="${DVD%/*}/${NEWDVD}" - else - DVD="${NEWDVD}" - fi - done - - echo "${DVD}" -} - -get_fstab_entry() { - test -z "$1" && return 1 - - echo "$(grep "$1" /etc/fstab | awk '$0 !~ /^[[:space:]]*#/ {print $1}')" -} - -if ! test -L "${DVD}" && ! test -b "${DVD}" -then - NEWDVD="$(get_fstab_entry "${DVD}")" - - if test -z "${NEWDVD}" - then - NEWDVD="$(get_fstab_entry $(basename "${DVD}"))" - fi - - if test -z "${NEWDVD}" - then - exit 1 - else - DVD="${NEWDVD}" - fi -fi - -DVD="$(check_device "${DVD}")" - -if test -z "${DVD}" -then - exit 1 -fi - -if test -b "${DVD}" -then - echo "$(echo ${DVD} | sed -e 's://:/:g')" -else - exit 1 -fi - -exit 0 diff --git a/media-video/drip/metadata.xml b/media-video/drip/metadata.xml deleted file mode 100644 index d9df1878d8e2..000000000000 --- a/media-video/drip/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -video - -- 2.26.2