diff options
Diffstat (limited to 'audio')
23 files changed, 312 insertions, 324 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 7da933a5a0cf..ff31e07e5ee3 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.8.0 -PORTREVISION= 4 +PORTVERSION= 2.10.0 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.8 +MASTER_SITE_SUBDIR= sources/gnome-media/2.10 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop USE_BZIP2= yes +INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ - gail +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + gail nautiluscdburner USE_GSTREAMER= esound cdparanoia CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 57f2938ee07f..10edadbbab8a 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 -SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 +MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88 +SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571 diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c new file mode 100644 index 000000000000..f316b7f01301 --- /dev/null +++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c @@ -0,0 +1,20 @@ +--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004 ++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005 +@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd + continue; + + sa_in6->sin6_scope_id = ifindex; +- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa)); ++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6)); + if (con == 0 || errno == EINPROGRESS) + break; + +@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd + memcpy(&sa, &addr->sa, sizeof(sa)); + sa_in = (struct sockaddr_in *) &sa; + sa_in->sin_family = AF_INET; +- con = connect(s->sockfd, &sa, sizeof(s->sa)); ++ con = connect(s->sockfd, &sa, sizeof(sa)); + } + + /* Connect (but non-blocking!) */ diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000000..b534f8fec923 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,30 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000000..4942519dde40 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,32 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ + return FALSE; + } + ++#if !defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. ++ */ ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } diff --git a/audio/gnome-media/files/patch-grecord_gsr-window.c b/audio/gnome-media/files/patch-grecord_gsr-window.c deleted file mode 100644 index c26eb6889094..000000000000 --- a/audio/gnome-media/files/patch-grecord_gsr-window.c +++ /dev/null @@ -1,57 +0,0 @@ ---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004 -+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004 -@@ -29,7 +29,7 @@ - #include <unistd.h> - - #include <gnome.h> --#include <libgnomevfs/gnome-vfs-utils.h> -+#include <libgnomevfs/gnome-vfs.h> - #include <gconf/gconf-client.h> - #include <gst/gst.h> - #include <gst/gconf/gconf.h> -@@ -475,16 +475,41 @@ - { - GSRWindowPrivate *priv; - GMAudioProfile *profile; -- char *tmp; -+ char *tmp, *src; -+ GnomeVFSURI *src_uri, *dst_uri; - - priv = window->priv; - - profile = gm_audio_profile_choose_get_active (priv->profile); - -- tmp = g_strdup_printf ("%s.%s", name, -+ tmp = g_strdup_printf ("file://%s.%s", name, - gm_audio_profile_get_extension (profile)); -- rename (priv->record_filename, tmp); -- g_free (tmp); -+ src = g_strdup_printf ("file://%s", priv->record_filename); -+ src_uri = gnome_vfs_uri_new (src); -+ dst_uri = gnome_vfs_uri_new (tmp); -+ g_free (src); -+ g_free (tmp); -+ if (src_uri && dst_uri) { -+ GnomeVFSResult result; -+ result = gnome_vfs_xfer_uri (src_uri, dst_uri, -+ GNOME_VFS_XFER_DEFAULT, -+ GNOME_VFS_XFER_ERROR_MODE_ABORT, -+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, -+ NULL, NULL); -+ if (result == GNOME_VFS_OK) { -+ char *title, *short_name; -+ priv->filename = g_strdup_printf ("%s.%s", -+ name, gm_audio_profile_get_extension (profile)); -+ short_name = g_path_get_basename (priv->filename); -+ title = g_strdup_printf ("%s - Sound Recorder", -+ short_name); -+ gtk_window_set_title (GTK_WINDOW (window), title); -+ priv->dirty = FALSE; -+ g_free (title); -+ } -+ gnome_vfs_uri_unref (src_uri); -+ gnome_vfs_uri_unref (dst_uri); -+ } - } - - static void diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index a80344126abe..42fabcc9a822 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor +share/gnome/applications/cddb-slave.desktop share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop -share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/3dsound.png +share/gnome/gnome-media/pixmaps/chain-broken.png +share/gnome/gnome-media/pixmaps/chain.png +share/gnome/gnome-media/pixmaps/headphones.png share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/noplay.png +share/gnome/gnome-media/pixmaps/norecord.png share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/play.png +share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml @@ -434,6 +442,7 @@ share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 7da933a5a0cf..ff31e07e5ee3 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.8.0 -PORTREVISION= 4 +PORTVERSION= 2.10.0 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.8 +MASTER_SITE_SUBDIR= sources/gnome-media/2.10 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop USE_BZIP2= yes +INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ - gail +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + gail nautiluscdburner USE_GSTREAMER= esound cdparanoia CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index 57f2938ee07f..10edadbbab8a 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 -SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 +MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88 +SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571 diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c new file mode 100644 index 000000000000..f316b7f01301 --- /dev/null +++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c @@ -0,0 +1,20 @@ +--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004 ++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005 +@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd + continue; + + sa_in6->sin6_scope_id = ifindex; +- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa)); ++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6)); + if (con == 0 || errno == EINPROGRESS) + break; + +@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd + memcpy(&sa, &addr->sa, sizeof(sa)); + sa_in = (struct sockaddr_in *) &sa; + sa_in->sin_family = AF_INET; +- con = connect(s->sockfd, &sa, sizeof(s->sa)); ++ con = connect(s->sockfd, &sa, sizeof(sa)); + } + + /* Connect (but non-blocking!) */ diff --git a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000000..b534f8fec923 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,30 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000000..4942519dde40 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,32 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ + return FALSE; + } + ++#if !defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. ++ */ ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } diff --git a/audio/gnomemedia2/files/patch-grecord_gsr-window.c b/audio/gnomemedia2/files/patch-grecord_gsr-window.c deleted file mode 100644 index c26eb6889094..000000000000 --- a/audio/gnomemedia2/files/patch-grecord_gsr-window.c +++ /dev/null @@ -1,57 +0,0 @@ ---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004 -+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004 -@@ -29,7 +29,7 @@ - #include <unistd.h> - - #include <gnome.h> --#include <libgnomevfs/gnome-vfs-utils.h> -+#include <libgnomevfs/gnome-vfs.h> - #include <gconf/gconf-client.h> - #include <gst/gst.h> - #include <gst/gconf/gconf.h> -@@ -475,16 +475,41 @@ - { - GSRWindowPrivate *priv; - GMAudioProfile *profile; -- char *tmp; -+ char *tmp, *src; -+ GnomeVFSURI *src_uri, *dst_uri; - - priv = window->priv; - - profile = gm_audio_profile_choose_get_active (priv->profile); - -- tmp = g_strdup_printf ("%s.%s", name, -+ tmp = g_strdup_printf ("file://%s.%s", name, - gm_audio_profile_get_extension (profile)); -- rename (priv->record_filename, tmp); -- g_free (tmp); -+ src = g_strdup_printf ("file://%s", priv->record_filename); -+ src_uri = gnome_vfs_uri_new (src); -+ dst_uri = gnome_vfs_uri_new (tmp); -+ g_free (src); -+ g_free (tmp); -+ if (src_uri && dst_uri) { -+ GnomeVFSResult result; -+ result = gnome_vfs_xfer_uri (src_uri, dst_uri, -+ GNOME_VFS_XFER_DEFAULT, -+ GNOME_VFS_XFER_ERROR_MODE_ABORT, -+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, -+ NULL, NULL); -+ if (result == GNOME_VFS_OK) { -+ char *title, *short_name; -+ priv->filename = g_strdup_printf ("%s.%s", -+ name, gm_audio_profile_get_extension (profile)); -+ short_name = g_path_get_basename (priv->filename); -+ title = g_strdup_printf ("%s - Sound Recorder", -+ short_name); -+ gtk_window_set_title (GTK_WINDOW (window), title); -+ priv->dirty = FALSE; -+ g_free (title); -+ } -+ gnome_vfs_uri_unref (src_uri); -+ gnome_vfs_uri_unref (dst_uri); -+ } - } - - static void diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index a80344126abe..42fabcc9a822 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor +share/gnome/applications/cddb-slave.desktop share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop -share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/3dsound.png +share/gnome/gnome-media/pixmaps/chain-broken.png +share/gnome/gnome-media/pixmaps/chain.png +share/gnome/gnome-media/pixmaps/headphones.png share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/noplay.png +share/gnome/gnome-media/pixmaps/norecord.png share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/play.png +share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml @@ -434,6 +442,7 @@ share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 1c4baeb4411c..1796cc0cf6c0 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -6,10 +6,10 @@ # PORTNAME= sound-juicer -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= audio gnome -MASTER_SITES= http://www.burtonini.com/computing/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,14 +18,17 @@ COMMENT= Clean, mean and lean CD ripper for GNOME2 LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 +USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes +INSTALLS_OMF= yes USE_REINPLACE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner USE_GSTREAMER= cdparanoia vorbis flac USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-ignore-missing-cd +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= sound-juicer.schemas diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index 49ba9dee4363..b235ee6b29aa 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/sound-juicer-0.6.0.tar.gz) = bab9ac8e3f0ba66f360485aafdd379f8 -SIZE (gnome2/sound-juicer-0.6.0.tar.gz) = 597829 +MD5 (gnome2/sound-juicer-2.10.0.tar.bz2) = 2450626f15847d922e47781e3e259b83 +SIZE (gnome2/sound-juicer-2.10.0.tar.bz2) = 503090 diff --git a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c deleted file mode 100644 index 3bf5d559e3a5..000000000000 --- a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bacon-cd-selection.c.orig Sun Dec 12 10:27:00 2004 -+++ src/bacon-cd-selection.c Sun Dec 12 10:27:57 2004 -@@ -179,10 +179,10 @@ - static void - bacon_cd_selection_init (BaconCdSelection *bcs) - { -- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -- - GtkCellRenderer *cell; - GtkListStore *store; -+ -+ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (bcs), diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c deleted file mode 100644 index 56d594fb962f..000000000000 --- a/audio/sound-juicer/files/patch-src::cd-drive.c +++ /dev/null @@ -1,103 +0,0 @@ ---- src/cd-drive.c.orig Sun Dec 12 01:39:32 2004 -+++ src/cd-drive.c Sun Dec 12 01:41:50 2004 -@@ -596,7 +596,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_RDWR|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_RDWR|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__ */ - -@@ -798,50 +840,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_RDWR|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_RDWR|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 * diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c new file mode 100644 index 000000000000..5bbf888cbed3 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-genres.c @@ -0,0 +1,13 @@ +--- src/sj-genres.c.orig Mon Jan 17 13:22:28 2005 ++++ src/sj-genres.c Mon Jan 17 13:22:34 2005 +@@ -20,9 +20,9 @@ + * Authors: Ross Burton <ross@burtonini.com> + */ + +-#include "sound-juicer.h" + + #include <glib/gi18n.h> ++#include "sound-juicer.h" + + #include "sj-genres.h" + diff --git a/audio/sound-juicer/files/patch-src::sj-main.c b/audio/sound-juicer/files/patch-src::sj-main.c deleted file mode 100644 index 547e5c245d67..000000000000 --- a/audio/sound-juicer/files/patch-src::sj-main.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c new file mode 100644 index 000000000000..c510a48dc6f4 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c @@ -0,0 +1,18 @@ +--- src/sj-metadata-musicbrainz.c.orig Mon Jan 17 13:22:54 2005 ++++ src/sj-metadata-musicbrainz.c Mon Jan 17 13:23:02 2005 +@@ -18,7 +18,6 @@ + * Boston, MA 02111-1307, USA. + */ + +-#include "sound-juicer.h" + + #include <string.h> + #include <glib-object.h> +@@ -32,6 +31,7 @@ + #include <stdlib.h> + #include <unistd.h> + ++#include "sound-juicer.h" + #include "sj-metadata-musicbrainz.h" + #include "sj-structures.h" + #include "sj-error.h" diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c index feea811fcebb..b29d97bbd4f9 100644 --- a/audio/sound-juicer/files/patch-src::sj-util.c +++ b/audio/sound-juicer/files/patch-src::sj-util.c @@ -1,71 +1,43 @@ ---- 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); +--- src/sj-util.c.orig Tue Feb 8 14:06:57 2005 ++++ src/sj-util.c Tue Feb 8 14:25:03 2005 +@@ -157,6 +157,15 @@ if (fd < 0) { return FALSE; } ++#if defined(__FreeBSD__) ++ status = FALSE; ++ ++ ioctl (fd, CDIOCCLOSE); ++ ++ close (fd); ++ ++ return status; ++#else status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); -+ close (fd); if (status < 0) { -- close (fd); - return FALSE; - } +@@ -167,6 +176,7 @@ + close (fd); -- 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; +@@ -191,7 +201,7 @@ + default: + return FALSE; } - -+#if defined(__linux__) - status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT); -+ close (fd); - if (status < 0) { -- close (fd); +- ++/* + fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); + if (fd <0) { return FALSE; - } +@@ -206,6 +216,7 @@ + close (fd); -- 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-plist b/audio/sound-juicer/pkg-plist index af60b4f7cc77..bab1ce85bba4 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -9,6 +9,51 @@ share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf share/gnome/pixmaps/sound-juicer.png share/gnome/sound-juicer/orange-slice.png share/gnome/sound-juicer/sound-juicer.glade +share/locale/ar/LC_MESSAGES/sound-juicer.mo +share/locale/az/LC_MESSAGES/sound-juicer.mo +share/locale/be/LC_MESSAGES/sound-juicer.mo +share/locale/bg/LC_MESSAGES/sound-juicer.mo +share/locale/ca/LC_MESSAGES/sound-juicer.mo +share/locale/cs/LC_MESSAGES/sound-juicer.mo +share/locale/da/LC_MESSAGES/sound-juicer.mo +share/locale/de/LC_MESSAGES/sound-juicer.mo +share/locale/el/LC_MESSAGES/sound-juicer.mo +share/locale/en_CA/LC_MESSAGES/sound-juicer.mo +share/locale/en_GB/LC_MESSAGES/sound-juicer.mo +share/locale/es/LC_MESSAGES/sound-juicer.mo +share/locale/et/LC_MESSAGES/sound-juicer.mo +share/locale/eu/LC_MESSAGES/sound-juicer.mo +share/locale/fi/LC_MESSAGES/sound-juicer.mo +share/locale/fr/LC_MESSAGES/sound-juicer.mo +share/locale/gu/LC_MESSAGES/sound-juicer.mo +share/locale/hi/LC_MESSAGES/sound-juicer.mo +share/locale/hr/LC_MESSAGES/sound-juicer.mo +share/locale/hu/LC_MESSAGES/sound-juicer.mo +share/locale/it/LC_MESSAGES/sound-juicer.mo +share/locale/ja/LC_MESSAGES/sound-juicer.mo +share/locale/ko/LC_MESSAGES/sound-juicer.mo +share/locale/lt/LC_MESSAGES/sound-juicer.mo +share/locale/mk/LC_MESSAGES/sound-juicer.mo +share/locale/ml/LC_MESSAGES/sound-juicer.mo +share/locale/ms/LC_MESSAGES/sound-juicer.mo +share/locale/nb/LC_MESSAGES/sound-juicer.mo +share/locale/ne/LC_MESSAGES/sound-juicer.mo +share/locale/nl/LC_MESSAGES/sound-juicer.mo +share/locale/no/LC_MESSAGES/sound-juicer.mo +share/locale/pa/LC_MESSAGES/sound-juicer.mo +share/locale/pl/LC_MESSAGES/sound-juicer.mo +share/locale/pt/LC_MESSAGES/sound-juicer.mo +share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo +share/locale/ru/LC_MESSAGES/sound-juicer.mo +share/locale/sq/LC_MESSAGES/sound-juicer.mo +share/locale/sr/LC_MESSAGES/sound-juicer.mo +share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo +share/locale/sv/LC_MESSAGES/sound-juicer.mo +share/locale/th/LC_MESSAGES/sound-juicer.mo +share/locale/tr/LC_MESSAGES/sound-juicer.mo +share/locale/uk/LC_MESSAGES/sound-juicer.mo +share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo +share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo @dirrm share/gnome/sound-juicer @dirrm share/gnome/omf/sound-juicer @dirrm share/gnome/help/sound-juicer/C/figures |