Attachment 8737 Details for Bug 18166 – file.diff

[patch] file.diff

file.diff (text/plain), 3.66 KB, created by Oyvind Moll on 2000-04-22 23:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oyvind Moll

Created: 2000-04-22 23:00:02 UTC

Size: 3.66 KB

patch

obsolete

>diff -uNr ripit.orig/Makefile ripit/Makefile
>--- ripit.orig/Makefile	Fri Apr 21 12:06:33 2000
>+++ ripit/Makefile	Fri Apr 21 12:24:50 2000
>@@ -6,14 +6,16 @@
> #
> 
> PORTNAME=	ripit
>-PORTVERSION=	1.5
>+PORTVERSION=	1.6
> CATEGORIES=	audio
> MASTER_SITES=	http://www.initio.no/~oyvindmo/distfiles/
> 
> MAINTAINER=	oyvindmo@initio.no
> 
> RUN_DEPENDS=	bladeenc:${PORTSDIR}/audio/bladeenc \
>+		lame:${PORTSDIR}/audio/lame \
> 		tosha:${PORTSDIR}/audio/tosha \
>+		cdda2wav:${PORTSDIR}/sysutils/cdrecord \
> 		cda:${PORTSDIR}/audio/xmcd
> 
> NO_BUILD=	yes
>diff -uNr ripit.orig/files/md5 ripit/files/md5
>--- ripit.orig/files/md5	Fri Apr 21 12:06:33 2000
>+++ ripit/files/md5	Fri Apr 21 12:10:56 2000
>@@ -1 +1 @@
>-MD5 (ripit-1.5.tar.gz) = ad796d63c258a68de7edc800bfc67e9b
>+MD5 (ripit-1.6.tar.gz) = b46334c00712b65f6b59ad23caab2b94
>diff -uNr ripit.orig/patches/patch-aa ripit/patches/patch-aa
>--- ripit.orig/patches/patch-aa	Fri Apr 21 12:06:33 2000
>+++ ripit/patches/patch-aa	Fri Apr 21 12:17:52 2000
>@@ -1,6 +1,6 @@
>---- ripit.pl.orig	Wed Sep  1 13:51:06 1999
>-+++ ripit.pl	Wed Sep  1 13:53:12 1999
>-@@ -26,10 +26,10 @@
>+--- ripit.pl.orig	Fri Apr 21 12:11:23 2000
>++++ ripit.pl	Fri Apr 21 12:16:20 2000
>+@@ -26,12 +26,12 @@
>  # User configurable variables
>  #
>  
>@@ -9,35 +9,39 @@
> +$cddev 		= "/dev/rcd0c";		# CD Audio device
> +$outputdir 	= "/home/mp3/";		# Where the MP3s should go
>  $bitrate	= 160;			# Bitrate for MP3s
>--$encoder	= 1; 			# 0 - Bladeenc, 1 - Lame
>-+$encoder	= 0; 			# 0 - Bladeenc, 1 - Lame
>+ $encoder	= 1; 			# 0 - Bladeenc, 1 - Lame
>+ $encopt		= "";			# options for mp3 encoder
>+-$cdripper	= 0;			# 0 - cdparanoia, 1 - cdda2wav
>++$cdripper	= 2;			# 0 - cdparanoia, 1 - cdda2wav, 2 - tosha
>+ $cdopt		= "";			# options for cdaudio ripper
>  
>  $use_underscore = 0;	# Use _ instead of spaces in filenames (1 yes, 0 no)
>- 
>-@@ -329,14 +329,11 @@
>- 
>-     &printflush(RIPLOG,"Ripping $tracklist[$_ - 1]...\n");
>- 
>--    if (system("cdparanoia -d $cddev $riptrackno \"$riptrackname.rip\"")) {
>--       &printflush(RIPLOG,"cdparanoia failed on $tracklist[$_ - 1]\n");
>--       die "cdparanoia failed on $tracklist[$_ - 1]";
>-+    if (system("tosha -d $cddev -f wav -t $riptrackno -o \"$riptrackname.wav\"")) {
>-+       &printflush(RIPLOG,"tosha failed on $tracklist[$_ - 1]\n");
>-+       die "tosha failed on $tracklist[$_ - 1]";
>+@@ -340,12 +340,18 @@
>+          die "cdparanoia failed on $tracklist[$_ - 1]";
>+       }
>      }
>- 
>--    # Rename rip file to a wav for encoder
>--    rename "$riptrackname.rip","$riptrackname.wav";
>--
>-     &printflush(RIPLOG,"Rip complete $tracklist[$_ - 1]\n");
>- 
>-     # Start the Encoder in the background. but only once
>-@@ -367,7 +364,7 @@
>+-    else {
>++    elsif ($cdripper == 1) {
>+       if (system("cdda2wav -D $cddev -Q -H $cdopt -t $riptrackno \"$riptrackname.rip\"")) {
>+          &printflush(RIPLOG,"cdda2wav failed on $tracklist[$_ - 1]\n");
>+          die "cdda2wav failed on $tracklist[$_ - 1]";
>+       }
>+     }
>++    else {
>++      if (system("tosha -d $cddev -f wav -t $riptrackno -o \"$riptrackname.rip\"")) {
>++         &printflush(RIPLOG,"tosha failed on $tracklist[$_ - 1]\n");
>++         die "tosha failed on $tracklist[$_ - 1]";
>++      }
>++    } 
>+ 
>+     # Rename rip file to a wav for encoder
>+     rename "$riptrackname.rip","$riptrackname.wav";
>+@@ -380,7 +386,7 @@
>      print "\nMP3 Encoding track ".$ncount." of ".($#seltrack + 1)."\n";
>      &printflush(RIPLOG,"Encoding $tracklist[$_ - 1]...\n");
>  
> -    # Keep looping until the file appears, ie wait for cdparanoia
>-+    # Keep looping until the file appears, ie wait for tosha
>++    # Keep looping until the file appears, ie wait for cdripper
>      # timeout after 30 minutes
>      $x=0;
>      while( ! -r "$riptrackname.wav" ){

Actions: View | Diff

Attachments on bug 18166: 8737