Attachment 56539 Details for Bug 85374 – file.diff

[patch] file.diff

file.diff (text/plain), 3.09 KB, created by tkato432 on 2005-08-28 11:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-08-28 11:10:15 UTC

Size: 3.09 KB

patch

obsolete

>diff -urN /usr/ports/audio/mhwaveedit/Makefile audio/mhwaveedit/Makefile
>--- /usr/ports/audio/mhwaveedit/Makefile	Mon Jul 18 15:17:27 2005
>+++ audio/mhwaveedit/Makefile	Sat Aug 13 15:30:13 2005
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	mhwaveedit
>-PORTVERSION=	1.4.2
>+PORTVERSION=	1.4.3
> CATEGORIES=	audio
> MASTER_SITES=	http://download.gna.org/mhwaveedit/
> 
>diff -urN /usr/ports/audio/mhwaveedit/distinfo audio/mhwaveedit/distinfo
>--- /usr/ports/audio/mhwaveedit/distinfo	Mon Jul 18 15:17:27 2005
>+++ audio/mhwaveedit/distinfo	Sat Aug 13 15:33:02 2005
>@@ -1,2 +1,2 @@
>-MD5 (mhwaveedit-1.4.2.tar.bz2) = 0139741165af149d3d014d3fecbb4cbd
>-SIZE (mhwaveedit-1.4.2.tar.bz2) = 375874
>+MD5 (mhwaveedit-1.4.3.tar.bz2) = faa12cb041bf96d1328bc65014ad9635
>+SIZE (mhwaveedit-1.4.3.tar.bz2) = 378437
>diff -urN /usr/ports/audio/mhwaveedit/files/patch-src-filetypes.c audio/mhwaveedit/files/patch-src-filetypes.c
>--- /usr/ports/audio/mhwaveedit/files/patch-src-filetypes.c	Mon Jul 18 06:28:13 2005
>+++ audio/mhwaveedit/files/patch-src-filetypes.c	Sat Aug 13 15:45:19 2005
>@@ -1,5 +1,5 @@
>---- src/filetypes.c.orig	Wed Jul 13 07:44:46 2005
>-+++ src/filetypes.c	Thu Jul 14 01:59:03 2005
>+--- src/filetypes.c.orig	Sat Aug 13 02:01:54 2005
>++++ src/filetypes.c	Sat Aug 13 15:45:17 2005
> @@ -97,15 +97,6 @@
>       return FALSE;
>  }
>@@ -16,7 +16,7 @@
>  static void register_file_type(gchar *name, gchar *ext, 
>  			       gboolean (*typecheck)(gchar *filename),
>  			       Chunk *(*load)(gchar *filename, 
>-@@ -922,7 +913,7 @@
>+@@ -927,7 +918,7 @@
>       b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar);
>       g_free(c);     
>       if (x != NULL) gtk_object_sink(GTK_OBJECT(x));
>@@ -25,7 +25,7 @@
>       if (b || !file_exists(filename)) {
>  	  *fatal = TRUE;
>  	  return TRUE;
>-@@ -980,7 +971,7 @@
>+@@ -985,7 +976,7 @@
>  	       gtk_object_sink(GTK_OBJECT(x));
>  	  }
>       }
>@@ -34,3 +34,40 @@
>       if (b || !file_exists(filename)) {
>  	  *fatal = TRUE;
>  	  return TRUE;
>+@@ -999,7 +990,11 @@
>+ static Chunk *try_mplayer(gchar *filename, int dither_mode, StatusBar *bar)
>+ {
>+      gchar *c,*d;
>+-     char *tempname;
>++     gchar *tempname;
>++     gchar *argv[] = { "sh", "-c", 
>++		      "mplayer -quiet -noconsolecontrols "
>++		      "-ao \"pcm:file=$OUTFILE\" -vc dummy -vo null "
>++		      "\"$INFILE\"", NULL };
>+      Chunk *x;
>+      if (!program_exists("mplayer")) return NULL;
>+      tempname = get_temp_filename(0);
>+@@ -1008,20 +1003,16 @@
>+      if (xputenv(c)) { g_free(d); g_free(c); g_free(tempname); return NULL; }
>+      if (xputenv(d)) { 
>+ 	  g_free(d); 
>+-	  if (!xunsetenv("OUTFILE"))
>++	  if (!xputenv("OUTFILE"))
>+ 	       g_free(c);
>+ 	  g_free(tempname);
>+ 	  return NULL; 
>+      }
>+-     char *argv[] = { "sh", "-c", 
>+-		      "mplayer -quiet -noconsolecontrols "
>+-		      "-ao \"pcm:file=$OUTFILE\" -vc dummy -vo null "
>+-		      "\"$INFILE\"", NULL };
>+ 
>+      x = run_decoder(filename,tempname,"sh",argv,dither_mode,bar);
>+ 
>+-     if (!xunsetenv("OUTFILE")) g_free(c);
>+-     if (!xunsetenv("INFILE")) g_free(d);
>++     if (!xputenv("OUTFILE")) g_free(c);
>++     if (!xputenv("INFILE")) g_free(d);
>+      g_free(tempname);
>+      
>+      return x;

Actions: View | Diff

Attachments on bug 85374: 56539