diff options
| author | jeh <jeh@FreeBSD.org> | 2000-10-24 03:51:17 +0800 |
|---|---|---|
| committer | jeh <jeh@FreeBSD.org> | 2000-10-24 03:51:17 +0800 |
| commit | e729f75fafcac61796b84a152302b346a209f008 (patch) | |
| tree | 996f7b7c160949761806a7215c6c64a2e3478d1a /audio/grip/files | |
| parent | c1f582ea154d45afcaf4b7b0c766c8ba18b1412a (diff) | |
| download | freebsd-ports-gnome-e729f75fafcac61796b84a152302b346a209f008.tar.gz freebsd-ports-gnome-e729f75fafcac61796b84a152302b346a209f008.tar.zst freebsd-ports-gnome-e729f75fafcac61796b84a152302b346a209f008.zip | |
Update to version 0.65
PR: 22246
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'audio/grip/files')
| -rw-r--r-- | audio/grip/files/patch-aa | 13 | ||||
| -rw-r--r-- | audio/grip/files/patch-ad | 42 |
2 files changed, 34 insertions, 21 deletions
diff --git a/audio/grip/files/patch-aa b/audio/grip/files/patch-aa index 73832f4e2104..b02145a186e2 100644 --- a/audio/grip/files/patch-aa +++ b/audio/grip/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Apr 19 00:37:44 2000 -+++ Makefile Tue Jul 11 03:58:32 2000 +--- Makefile.orig Thu Oct 19 04:12:53 2000 ++++ Makefile Fri Oct 20 20:33:10 2000 @@ -4,24 +4,24 @@ OS=$(shell uname -s) @@ -21,13 +21,12 @@ # Compiler flags -CFLAGS= -Wall `gtk-config --cflags` -DAUXDIR=\"$(AUXDIR)\" \ -- -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT -+CFLAGS+= `$(GTK_CONFIG) --cflags` -DAUXDIR=\"$(AUXDIR)\" \ -+ -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT -D_THREAD_SAFE ++CFLAGS+= `$(GTK_CONFIG) --cflags gthread` -DAUXDIR=\"$(AUXDIR)\" \ + -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT # Link libraries --LIBS= `gtk-config --libs` -+LIBS= `$(GTK_CONFIG) --libs` +-LIBS= `gtk-config --libs gthread` ++LIBS= `$(GTK_CONFIG) --libs gthread` ifeq ($(OS), Linux) LIBS+= -lpthread endif diff --git a/audio/grip/files/patch-ad b/audio/grip/files/patch-ad index 1f8e5382abbf..9fa8b797b681 100644 --- a/audio/grip/files/patch-ad +++ b/audio/grip/files/patch-ad @@ -1,15 +1,29 @@ ---- grip.c.orig Tue Apr 18 10:37:44 2000 -+++ grip.c Mon Sep 4 17:59:26 2000 -@@ -1279,6 +1279,12 @@ - CDStat(cd_desc,&info,FALSE); +--- grip.c.orig Thu Oct 19 04:12:53 2000 ++++ grip.c Fri Oct 20 20:55:01 2000 +@@ -314,7 +314,7 @@ + gboolean use_proxy=FALSE; + gboolean use_proxy_env=FALSE; - if(info.disc_present) { -+ /* FreeBSD CD ioctl CDIOREADTOCHEADER fails when old disk is ejected -+ * and a new disk one entered. Re-opening device fixes this. -+ */ -+ CDCloseDevice(cd_desc); -+ cd_desc = CDInitDevice(cddevice); -+ - CDStat(cd_desc,&info,TRUE); - - Debug("CDStat found a disc, checking tracks\n"); +-char *bin_search_paths[]={"/cpd/misc/bin","/usr/bin","/usr/local/bin",NULL}; ++char *bin_search_paths[]={"/cpd/misc/bin","/usr/bin","%%LOCALBASE%%/bin",NULL}; + Ripper ripper_defaults[]={ + #ifdef CDPAR + {"grip (cdparanoia)",""}, +@@ -327,7 +327,7 @@ + #endif + {"other",""}, + {"",""}}; +-char ripexename[256]="/usr/bin/cdparanoia"; ++char ripexename[256]="%%LOCALBASE%%/bin/cdparanoia"; + char ripcmdline[256]="-d %c %t:[.%b]-%t:[.%e] %f"; + int selected_ripper=0; + char outputdir[256]; +@@ -346,7 +346,7 @@ + gboolean disable_extra_paranoia=FALSE; + gboolean disable_scratch_detect=FALSE; + gboolean disable_scratch_repair=FALSE; +-char mp3exename[256]="/usr/bin/bladeenc"; ++char mp3exename[256]="%%LOCALBASE%%/bin/bladeenc"; + char mp3cmdline[256]="-%b -QUIT %f"; + int selected_encoder=1; + char mp3fileformat[256]="~/mp3/%a/%d/%n.mp3"; |