Update to 0.5.14

6 files changed, 120 insertions, 30 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 18e8d2a53cf0..8a06b58e43bd 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.5.12
-PORTREVISION=	3
+PORTVERSION=	0.5.14
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
@@ -24,6 +23,8 @@ USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui gstreamerplugins
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 
+GCONF_SCHEMAS=	sound-juicer.schemas
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You must have gstreamer-plugins built with Cdparanoia support!"
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 4714706f9b6a..ac518a1eece7 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.5.12.tar.gz) = 5ad2cbb1acb91d51d2a67f14d552ae4e
-SIZE (gnome2/sound-juicer-0.5.12.tar.gz) = 476944
+MD5 (gnome2/sound-juicer-0.5.14.tar.gz) = 21ac5d1b9497b3bba2e4050b995bb865
+SIZE (gnome2/sound-juicer-0.5.14.tar.gz) = 591553
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 33ff761019a1..f6adec0b44b7 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,7 +1,16 @@
---- src/Makefile.in.orig	Tue Jun 15 19:11:10 2004
-+++ src/Makefile.in	Tue Jun 15 19:30:57 2004
-@@ -131,7 +131,7 @@
- install_sh = @install_sh@
+--- src/Makefile.in.orig	Wed Nov 10 22:28:19 2004
++++ src/Makefile.in	Wed Nov 10 22:35:34 2004
+@@ -61,7 +61,7 @@
+ 	sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) $(am__objects_1) \
+ 	$(am__objects_2)
+ sound_juicer_OBJECTS = $(am_sound_juicer_OBJECTS)
+-sound_juicer_LDADD = $(LDADD)
++sound_juicer_LDADD = $(LDADD) -lcam
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +228,7 @@
+ target_alias = @target_alias@
  
  # General compiler flags
 -AM_CFLAGS = -Wall -Werror -export-dynamic -W -Wno-unused-parameter
@@ -9,12 +18,3 @@
  
  # General CPP flags. When I can demand automake 1.8, this can become
  # sound_juicer_CPPFLAGS.
-@@ -218,7 +218,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lcam
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bacon-cd-selection.Po \
diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c
new file mode 100644
index 000000000000..690b0953e199
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::cd-drive.c
@@ -0,0 +1,102 @@
+--- src/cd-drive.c.orig	Tue Sep 28 23:37:37 2004
++++ src/cd-drive.c	Wed Nov 10 22:37:44 2004
+@@ -578,7 +578,49 @@
+ 
+ #if defined(__linux__) || defined(__FreeBSD__)
+ 
++#if !defined(__linux__)
++static int
++get_device_max_read_speed (char *device)
++{
++	int fd;
++	int max_speed;
++	int read_speed, write_speed;
++
++	max_speed = -1;
++
++	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
++	if (fd < 0) {
++		return -1;
++	}
++
++	get_read_write_speed (fd, &read_speed, &write_speed);
++	close (fd);
++	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
++
++	return max_speed;
++}
++#endif
+ 
++static int
++get_device_max_write_speed (char *device)
++{
++	int fd;
++	int max_speed;
++	int read_speed, write_speed;
++
++	max_speed = -1;
++
++	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
++	if (fd < 0) {
++		return -1;
++	}
++
++	get_read_write_speed (fd, &read_speed, &write_speed);
++	close (fd);
++	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
++
++	return max_speed;
++}
+ 
+ #endif /* __linux__ || __FreeBSD__ */
+ 
+@@ -782,49 +824,6 @@
+ 	return NULL;
+ }
+ 
+-#if !defined(__linux)
+-static int
+-get_device_max_read_speed (char *device)
+-{
+-	int fd;
+-	int max_speed;
+-	int read_speed, write_speed;
+-
+-	max_speed = -1;
+-
+-	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+-	if (fd < 0) {
+-		return -1;
+-	}
+-
+-	get_read_write_speed (fd, &read_speed, &write_speed);
+-	close (fd);
+-	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
+-
+-	return max_speed;
+-}
+-#endif
+-
+-static int
+-get_device_max_write_speed (char *device)
+-{
+-	int fd;
+-	int max_speed;
+-	int read_speed, write_speed;
+-
+-	max_speed = -1;
+-
+-	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+-	if (fd < 0) {
+-		return -1;
+-	}
+-
+-	get_read_write_speed (fd, &read_speed, &write_speed);
+-	close (fd);
+-	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
+-
+-	return max_speed;
+-}
+ 
+ static char *
+ get_scsi_cd_name (int bus, int id, int lun, const char *dev,
diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c
index c276ef1f6cd8..feea811fcebb 100644
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ b/audio/sound-juicer/files/patch-src::sj-util.c
@@ -46,17 +46,6 @@
  }
  
  gboolean is_audio_cd (const char *device)
-@@ -172,6 +187,10 @@
-   CDMediaType type;
-   int fd, status;
- 
-+  if (tray_is_opened (device)) {
-+    return FALSE;
-+  }
-+
-   type = guess_media_type (device);
-   switch (type) {
-     case CD_MEDIA_TYPE_CD:
 @@ -191,15 +210,19 @@
      return FALSE;
    }
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 1c442da0ece4..132fd4f299ee 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,7 +1,5 @@
 bin/sound-juicer
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/sound-juicer.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/sound-juicer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/sound-juicer.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/sound-juicer.desktop
 share/gnome/help/sound-juicer/C/fdl-appendix.xml
 share/gnome/help/sound-juicer/C/figures/prefs.png