Attachment 35718 Details for Bug 57576 – file.diff

[patch] file.diff

file.diff (text/plain), 4.78 KB, created by umeno on 2003-10-04 15:30:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: umeno

Created: 2003-10-04 15:30:13 UTC

Size: 4.78 KB

patch

obsolete

>diff -urN xmms-sndstretch.orig/Makefile xmms-sndstretch/Makefile
>--- xmms-sndstretch.orig/Makefile	Mon Sep  8 14:32:32 2003
>+++ xmms-sndstretch/Makefile	Sat Oct  4 22:24:22 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	sndstretch
>-PORTVERSION=	0.5
>+PORTVERSION=	0.7
> CATEGORIES=	audio
> MASTER_SITES=	http://www.geocities.com/harpin_floh/mysoft/
> PKGNAMEPREFIX=	xmms-
>@@ -16,6 +16,7 @@
> COMMENT=	Plugin for xmms to change the pitch and/or speed
> 
> LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
>+BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
> 
> WRKSRC=		${WRKDIR}/sndstretch_xmms
> 
>diff -urN xmms-sndstretch.orig/distinfo xmms-sndstretch/distinfo
>--- xmms-sndstretch.orig/distinfo	Mon Dec  3 15:08:37 2001
>+++ xmms-sndstretch/distinfo	Sat Oct  4 20:26:17 2003
>@@ -1 +1 @@
>-MD5 (sndstretch_xmms-0.5.tar.gz) = adc805ead49861c6e55490f0b18e78ce
>+MD5 (sndstretch_xmms-0.7.tar.gz) = fb3b902649a221d651626dd42721789e
>diff -urN xmms-sndstretch.orig/files/patch-Makefile xmms-sndstretch/files/patch-Makefile
>--- xmms-sndstretch.orig/files/patch-Makefile	Mon Dec  3 15:08:40 2001
>+++ xmms-sndstretch/files/patch-Makefile	Sat Oct  4 22:26:26 2003
>@@ -1,27 +1,26 @@
>---- Makefile.orig	Thu Mar 15 18:15:55 2001
>-+++ Makefile	Mon Dec  3 00:55:22 2001
>-@@ -1,27 +1,28 @@
>+--- Makefile.orig	Sun Feb 10 22:56:42 2002
>++++ Makefile	Sat Oct  4 22:25:44 2003
>+@@ -1,8 +1,8 @@
> -CC      = gcc
> +CC      ?= gcc
>  #INCDIR  = -I sndstretch
>--CFLAGS  = -Wall -O6 $(INCDIR)
>-+CFLAGS  += -Wall $(INCDIR)
>-+THREADS= ${PTHREAD_LIBS}
>+-CFLAGS  = -Wall -O6 $(INCDIR) `xmms-config --cflags`
>++CFLAGS  += -Wall $(INCDIR) `xmms-config --cflags`
>+ #LDFLAGS = -lgthread -lpthread 
>+-LDFLAGS = -gthread -pthread `xmms-config --libs`
>++LDFLAGS = `${GTK_CONFIG} --libs` -pthread `xmms-config --libs`
>  
>  # maybe you will have to change this
>--XMMS_EPLUGIN_DIR = /usr/X11/lib/xmms/Output
>--XMMS_OPLUGIN_DIR = /usr/X11/lib/xmms/Effect
>-+XMMS_EPLUGIN_DIR = ${PREFIX}/lib/xmms/Output
>-+XMMS_OPLUGIN_DIR = ${PREFIX}/lib/xmms/Effect
>- 
>+ XMMS_EPLUGIN_DIR = `xmms-config --effect-plugin-dir`
>+@@ -11,19 +11,19 @@
>  all: effect_plugin output_plugin
>  
>  effect_plugin: sndstretch_xmms_eff.lo sndstretch.lo
>--	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `gtk-config --libs` -lgthread -lpthread -lpthread -lc -o sndstretch_xmms_eff.so
>+-	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_eff.so
> +	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_eff.so
>  
>  output_plugin: sndstretch_xmms_out.lo sndstretch.lo
>--	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `gtk-config --libs` -lgthread -lpthread -lpthread -lc -o sndstretch_xmms_out.so
>+-	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_out.so
> +	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_out.so
>  
>  sndstretch_xmms_eff.lo: sndstretch_xmms.h sndstretch_xmms_eff.c sndstretch_xmms.c FB_logo.xpm sndstretch_xmms-logo.xpm
>diff -urN xmms-sndstretch.orig/files/patch-sndstretch.c xmms-sndstretch/files/patch-sndstretch.c
>--- xmms-sndstretch.orig/files/patch-sndstretch.c	Mon Dec  3 15:08:40 2001
>+++ xmms-sndstretch/files/patch-sndstretch.c	Sat Oct  4 23:11:19 2003
>@@ -1,7 +1,5 @@
>-$FreeBSD: ports/audio/xmms-sndstretch/files/patch-sndstretch.c,v 1.1 2001/12/03 06:08:40 petef Exp $
>-
>---- sndstretch.c.orig	Thu Sep 27 17:10:34 2001
>-+++ sndstretch.c	Sat Nov 10 12:54:19 2001
>+--- sndstretch.c.orig	Fri Sep 28 00:10:34 2001
>++++ sndstretch.c	Sat Oct  4 23:10:14 2003
> @@ -1053,9 +1053,11 @@
>          
>          speed_act = speed;
>@@ -14,4 +12,3 @@
>          fade_shift_act = fade_shift;
>  
>  //        if (ring_buff!=0) free(ring_buff);
>-
>diff -urN xmms-sndstretch.orig/files/patch-sndstretch_xmms.c xmms-sndstretch/files/patch-sndstretch_xmms.c
>--- xmms-sndstretch.orig/files/patch-sndstretch_xmms.c	Mon Dec  3 15:08:40 2001
>+++ xmms-sndstretch/files/patch-sndstretch_xmms.c	Thu Jan  1 09:00:00 1970
>@@ -1,16 +0,0 @@
>-$FreeBSD: ports/audio/xmms-sndstretch/files/patch-sndstretch_xmms.c,v 1.1 2001/12/03 06:08:40 petef Exp $
>-
>---- sndstretch_xmms.c.orig	Thu Sep 27 17:32:50 2001
>-+++ sndstretch_xmms.c	Sat Nov 10 12:54:24 2001
>-@@ -27,7 +27,11 @@
>- #include "sndstretch.h"
>- #include <fcntl.h>
>- #include <sys/ioctl.h>
>-+#ifdef __FreeBSD__
>-+#include <sys/soundcard.h>
>-+#else
>- #include <linux/soundcard.h>
>-+#endif
>- #include <unistd.h>
>- #include <math.h>
>- #include <stdlib.h>
>diff -urN xmms-sndstretch.orig/pkg-plist xmms-sndstretch/pkg-plist
>--- xmms-sndstretch.orig/pkg-plist	Mon Dec  3 15:08:37 2001
>+++ xmms-sndstretch/pkg-plist	Sat Oct  4 22:46:06 2003
>@@ -1,2 +1,2 @@
>-lib/xmms/Effect/sndstretch_xmms_out.so
>-lib/xmms/Output/sndstretch_xmms_eff.so
>+lib/xmms/Output/sndstretch_xmms_out.so
>+lib/xmms/Effect/sndstretch_xmms_eff.so

Actions: View | Diff

Attachments on bug 57576: 35718