diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-15 14:08:23 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-15 14:08:23 +0800 |
commit | 9204bff1c2ec91e9850fac2820af21715ac537f2 (patch) | |
tree | 9cb99006e167dd9951e0f33bff64882876a224ec /audio | |
parent | 6e56d6a5ebeee89e690668e1d98ef1a1c9b21101 (diff) | |
download | marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar.gz marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar.bz2 marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar.lz marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar.xz marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.tar.zst marcuscom-ports-9204bff1c2ec91e9850fac2820af21715ac537f2.zip |
Add sound-juicer using the new USE_GSTREAMER macro
Approved by: marcus
bland
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3062 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
-rw-r--r-- | audio/sound-juicer/Makefile | 32 | ||||
-rw-r--r-- | audio/sound-juicer/distinfo | 2 | ||||
-rw-r--r-- | audio/sound-juicer/files/patch-src::Makefile.in | 20 | ||||
-rw-r--r-- | audio/sound-juicer/files/patch-src::cd-drive.c | 102 | ||||
-rw-r--r-- | audio/sound-juicer/files/patch-src::sj-main.c | 13 | ||||
-rw-r--r-- | audio/sound-juicer/files/patch-src::sj-util.c | 71 | ||||
-rw-r--r-- | audio/sound-juicer/pkg-descr | 5 | ||||
-rw-r--r-- | audio/sound-juicer/pkg-plist | 19 |
8 files changed, 264 insertions, 0 deletions
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile new file mode 100644 index 000000000..87dc8c04b --- /dev/null +++ b/audio/sound-juicer/Makefile @@ -0,0 +1,32 @@ +# New ports collection makefile for: soundjuicer +# Date created: 20 Jan 2004 +# Whom: Alexander Nedotsukov <bland@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= sound-juicer +PORTVERSION= 0.5.14 +CATEGORIES= audio gnome +MASTER_SITES= http://www.burtonini.com/computing/ +DIST_SUBDIR= gnome2 + +MAINTAINER= bland@FreeBSD.org +COMMENT= Clean, mean and lean CD ripper for GNOME2 + +LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz + +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_REINPLACE= yes +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GSTREAMER= cdparanoia +USE_LIBTOOL_VER=13 +CONFIGURE_ARGS= --enable-ignore-missing-cd + +GCONF_SCHEMAS= sound-juicer.schemas + +post-patch: + @${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' ${WRKSRC}/Makefile.in + +.include <bsd.port.mk> diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo new file mode 100644 index 000000000..ac518a1ee --- /dev/null +++ b/audio/sound-juicer/distinfo @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..f6adec0b4 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::Makefile.in @@ -0,0 +1,20 @@ +--- 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 ++AM_CFLAGS = -Wall -export-dynamic -W + + # General CPP flags. When I can demand automake 1.8, this can become + # sound_juicer_CPPFLAGS. 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 000000000..690b0953e --- /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-main.c b/audio/sound-juicer/files/patch-src::sj-main.c new file mode 100644 index 000000000..547e5c245 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-main.c @@ -0,0 +1,13 @@ +--- src/sj-main.c.orig Tue Jun 15 19:45:05 2004 ++++ src/sj-main.c Tue Jun 15 19:46:13 2004 +@@ -535,8 +535,9 @@ + */ + void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) + { +- g_assert (strcmp (entry->key, GCONF_DEVICE) == 0); + gboolean ignore_no_media = GPOINTER_TO_INT (user_data); ++ ++ g_assert (strcmp (entry->key, GCONF_DEVICE) == 0); + + if (entry->value == NULL + || !cd_drive_exists (gconf_value_get_string (entry->value))) { diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c new file mode 100644 index 000000000..feea811fc --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-util.c @@ -0,0 +1,71 @@ +--- src/sj-util.c.orig Tue Jun 15 19:14:09 2004 ++++ src/sj-util.c Tue Jun 15 19:29:16 2004 +@@ -122,6 +122,9 @@ + gtk_widget_destroy (dialog); + goto done; + } ++#ifdef __FreeBSD__ ++ ioctl (fd, CDIOCALLOW); ++#endif + result = ioctl (fd, CDROMEJECT); + if (result == -1) { + GtkWidget *dialog; +@@ -151,20 +154,32 @@ + { + int fd, status; + ++#if defined(__linux__) + fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); + if (fd < 0) { + return FALSE; + } + + status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); ++ close (fd); + if (status < 0) { +- close (fd); + return FALSE; + } + +- close (fd); +- + return status == CDS_TRAY_OPEN; ++#elif defined(__FreeBSD__) ++ struct ioc_toc_header h; ++ ++ fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); ++ if (fd < 0) { ++ return FALSE; ++ } ++ ++ status = ioctl (fd, CDIOREADTOCHEADER, &h); ++ close (fd); ++ ++ return status < 0; ++#endif + } + + gboolean is_audio_cd (const char *device) +@@ -191,15 +210,19 @@ + return FALSE; + } + ++#if defined(__linux__) + status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT); ++ close (fd); + if (status < 0) { +- close (fd); + return FALSE; + } + +- close (fd); +- + return status == CDS_AUDIO; ++#elif defined (__FreeBSD__) ++ return TRUE; ++#else ++ return TRUE; ++#endif + } + + /* Pass NULL to use g_free */ diff --git a/audio/sound-juicer/pkg-descr b/audio/sound-juicer/pkg-descr new file mode 100644 index 000000000..ec4721433 --- /dev/null +++ b/audio/sound-juicer/pkg-descr @@ -0,0 +1,5 @@ +Sound Juicer is a clean, mean and lean CD ripper for GNOME2. +It provides a clean interface and simple preferences, aiming +to do The Right Thing and What You Mean all of the time. + +WWW: http://www.burtonini.com/blog/computers/sound-juicer/ diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist new file mode 100644 index 000000000..132fd4f29 --- /dev/null +++ b/audio/sound-juicer/pkg-plist @@ -0,0 +1,19 @@ +bin/sound-juicer +etc/gconf/schemas/sound-juicer.schemas +share/gnome/applications/sound-juicer.desktop +share/gnome/help/sound-juicer/C/fdl-appendix.xml +share/gnome/help/sound-juicer/C/figures/prefs.png +share/gnome/help/sound-juicer/C/figures/startup.png +share/gnome/help/sound-juicer/C/legal.xml +share/gnome/help/sound-juicer/C/sound-juicer.xml +share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/sound-juicer.png +share/gnome/sound-juicer/orange-slice.png +share/gnome/sound-juicer/sound-juicer.glade +@dirrm share/gnome/sound-juicer +@dirrm share/gnome/omf/sound-juicer +@dirrm share/gnome/help/sound-juicer/C/figures +@dirrm share/gnome/help/sound-juicer/C +@dirrm share/gnome/help/sound-juicer +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf 2>/dev/null || /usr/bin/true |