summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/rhythmbox-devel/Makefile18
-rw-r--r--audio/rhythmbox-devel/distinfo4
-rw-r--r--audio/rhythmbox-devel/files/patch-configure47
-rw-r--r--audio/rhythmbox-devel/files/patch-daapsharing_rb-daap-src.c27
-rw-r--r--audio/rhythmbox-devel/pkg-plist23
-rw-r--r--audio/rhythmbox/Makefile18
-rw-r--r--audio/rhythmbox/distinfo4
-rw-r--r--audio/rhythmbox/files/patch-configure47
-rw-r--r--audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c27
-rw-r--r--audio/rhythmbox/pkg-plist23
10 files changed, 182 insertions, 56 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 1d64a2beb..4ec280463 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.36 2005/10/14 20:39:55 adamw Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -19,7 +18,8 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.2:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-1.1:${PORTSDIR}/devel/dbus
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -35,7 +35,8 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off
+OPTIONS= IPOD "Enable iPod support" off \
+ DAAP "Enable iTunes music sharing" off
.include <bsd.port.pre.mk>
@@ -53,10 +54,15 @@ USE_GSTREAMER+= vorbis
CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
.endif
-.if !defined(WITH_XINE) && defined(WITH_FAAD)
+.if defined(WITH_FAAD)
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_DAAP)
+CONFIGURE_ARGS+= --enable-daap
+LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup
+.endif
+
pre-everything::
.if !defined(WITH_VORBIS)
@${ECHO_MSG}
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index f95fb7a8a..be35324bb 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.9.0.tar.bz2) = 3e01834c5085af7fc11d0b98b76b9354
-SIZE (gnome2/rhythmbox-0.9.0.tar.bz2) = 2636822
+MD5 (gnome2/rhythmbox-0.9.1.tar.bz2) = 942b204d1227f4d66e26a289ca762df2
+SIZE (gnome2/rhythmbox-0.9.1.tar.bz2) = 2314153
diff --git a/audio/rhythmbox-devel/files/patch-configure b/audio/rhythmbox-devel/files/patch-configure
new file mode 100644
index 000000000..9c31cedaa
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.orig Mon Oct 17 10:21:14 2005
++++ configure Mon Oct 17 10:22:47 2005
+@@ -21603,7 +21603,7 @@
+ enable_hal02=yes
+ fi
+ fi
+- if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
++ if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
+ enable_hal=yes
+ else
+ enable_hal=no
+@@ -21620,7 +21620,7 @@
+ _ACEOF
+
+ enable_ipod=yes
+- if test x$enable_hal05 == xyes; then
++ if test x$enable_hal05 = xyes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL_0_5 1
+@@ -21887,7 +21887,7 @@
+ RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $SOUNDSYSTEM_LIBS"
+
+
+- if test "x$GST_INSPECT" == "x"; then
++ if test "x$GST_INSPECT" = "x"; then
+ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -22640,7 +22640,7 @@
+
+
+ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+- CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"`
++ CFLAGS=$CFLAGS\ -I`echo $x_includes | sed -e "s/:/ -I/g"`
+ fi
+ if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+ LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -22977,7 +22977,7 @@
+ fi
+ if test "x$enable_audiocd" = "xyes"; then
+
+- if test "x$GST_INSPECT" == "x"; then
++ if test "x$GST_INSPECT" = "x"; then
+ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/audio/rhythmbox-devel/files/patch-daapsharing_rb-daap-src.c b/audio/rhythmbox-devel/files/patch-daapsharing_rb-daap-src.c
new file mode 100644
index 000000000..fdbf98e76
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-daapsharing_rb-daap-src.c
@@ -0,0 +1,27 @@
+--- daapsharing/rb-daap-src.c.orig Sun Oct 16 05:50:21 2005
++++ daapsharing/rb-daap-src.c Mon Oct 17 10:30:20 2005
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#include <signal.h>
+
+ #include <libgnome/gnome-i18n.h>
+ #include <gst/gst.h>
+@@ -580,7 +581,15 @@ gst_tcp_socket_write (int socket, const
+ size_t bytes_written = 0;
+
+ while (bytes_written < count) {
+- ssize_t wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++ ssize_t wrote;
++#ifdef MSG_NOSIGNAL
++ wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++#else
++ signal (SIGPIPE, SIG_IGN);
++ wrote = send (socket, buf + bytes_written, count - bytes_written, 0);
++ signal (SIGPIPE, SIG_DFL);
++#endif
++
+
+ if (wrote <= 0) {
+ return bytes_written;
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 40faf0c09..0ff3e3fd9 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -3,6 +3,7 @@ lib/bonobo/librb-nautilus-context-menu.so
libdata/bonobo/servers/GNOME_Rhythmbox.server
libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
libdata/pkgconfig/rhythmbox.pc
+share/dbus-1/services/org.gnome.Rhythmbox.service
share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/authors.xml
@@ -80,31 +81,12 @@ share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-ja.omf
share/gnome/pixmaps/rhythmbox.png
share/gnome/rhythmbox/art/about-logo.png
-share/gnome/rhythmbox/art/rhythmbox-album.png
-share/gnome/rhythmbox/art/rhythmbox-audiocd.png
-share/gnome/rhythmbox/art/rhythmbox-automatic-playlist.png
-share/gnome/rhythmbox/art/rhythmbox-dnd.png
-share/gnome/rhythmbox/art/rhythmbox-ipod.png
-share/gnome/rhythmbox/art/rhythmbox-iradio.png
-share/gnome/rhythmbox/art/rhythmbox-library.png
share/gnome/rhythmbox/art/rhythmbox-no-star.png
-share/gnome/rhythmbox/art/rhythmbox-paused.png
-share/gnome/rhythmbox/art/rhythmbox-playback-error.png
-share/gnome/rhythmbox/art/rhythmbox-playing.png
-share/gnome/rhythmbox/art/rhythmbox-playlist-menu.png
-share/gnome/rhythmbox/art/rhythmbox-playlist.png
-share/gnome/rhythmbox/art/rhythmbox-repeat.png
share/gnome/rhythmbox/art/rhythmbox-set-star.png
-share/gnome/rhythmbox/art/rhythmbox-shuffle.png
share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
share/gnome/rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/rhythmbox/art/rhythmbox-visuals.png
-share/gnome/rhythmbox/art/rhythmbox-volume-max.png
-share/gnome/rhythmbox/art/rhythmbox-volume-medium.png
-share/gnome/rhythmbox/art/rhythmbox-volume-min.png
-share/gnome/rhythmbox/art/rhythmbox-volume-mute.png
-share/gnome/rhythmbox/art/rhythmbox-volume-zero.png
share/gnome/rhythmbox/glade/create-playlist.glade
+share/gnome/rhythmbox/glade/daap-prefs.glade
share/gnome/rhythmbox/glade/druid.glade
share/gnome/rhythmbox/glade/general-prefs.glade
share/gnome/rhythmbox/glade/library-prefs.glade
@@ -152,6 +134,7 @@ share/locale/ml/LC_MESSAGES/rhythmbox.mo
share/locale/mn/LC_MESSAGES/rhythmbox.mo
share/locale/ms/LC_MESSAGES/rhythmbox.mo
share/locale/nb/LC_MESSAGES/rhythmbox.mo
+share/locale/ne/LC_MESSAGES/rhythmbox.mo
share/locale/nl/LC_MESSAGES/rhythmbox.mo
share/locale/no/LC_MESSAGES/rhythmbox.mo
share/locale/pa/LC_MESSAGES/rhythmbox.mo
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 1d64a2beb..4ec280463 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.36 2005/10/14 20:39:55 adamw Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -19,7 +18,8 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.2:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-1.1:${PORTSDIR}/devel/dbus
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -35,7 +35,8 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off
+OPTIONS= IPOD "Enable iPod support" off \
+ DAAP "Enable iTunes music sharing" off
.include <bsd.port.pre.mk>
@@ -53,10 +54,15 @@ USE_GSTREAMER+= vorbis
CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
.endif
-.if !defined(WITH_XINE) && defined(WITH_FAAD)
+.if defined(WITH_FAAD)
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_DAAP)
+CONFIGURE_ARGS+= --enable-daap
+LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup
+.endif
+
pre-everything::
.if !defined(WITH_VORBIS)
@${ECHO_MSG}
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index f95fb7a8a..be35324bb 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.9.0.tar.bz2) = 3e01834c5085af7fc11d0b98b76b9354
-SIZE (gnome2/rhythmbox-0.9.0.tar.bz2) = 2636822
+MD5 (gnome2/rhythmbox-0.9.1.tar.bz2) = 942b204d1227f4d66e26a289ca762df2
+SIZE (gnome2/rhythmbox-0.9.1.tar.bz2) = 2314153
diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure
new file mode 100644
index 000000000..9c31cedaa
--- /dev/null
+++ b/audio/rhythmbox/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.orig Mon Oct 17 10:21:14 2005
++++ configure Mon Oct 17 10:22:47 2005
+@@ -21603,7 +21603,7 @@
+ enable_hal02=yes
+ fi
+ fi
+- if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
++ if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
+ enable_hal=yes
+ else
+ enable_hal=no
+@@ -21620,7 +21620,7 @@
+ _ACEOF
+
+ enable_ipod=yes
+- if test x$enable_hal05 == xyes; then
++ if test x$enable_hal05 = xyes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL_0_5 1
+@@ -21887,7 +21887,7 @@
+ RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $SOUNDSYSTEM_LIBS"
+
+
+- if test "x$GST_INSPECT" == "x"; then
++ if test "x$GST_INSPECT" = "x"; then
+ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -22640,7 +22640,7 @@
+
+
+ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+- CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"`
++ CFLAGS=$CFLAGS\ -I`echo $x_includes | sed -e "s/:/ -I/g"`
+ fi
+ if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+ LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -22977,7 +22977,7 @@
+ fi
+ if test "x$enable_audiocd" = "xyes"; then
+
+- if test "x$GST_INSPECT" == "x"; then
++ if test "x$GST_INSPECT" = "x"; then
+ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c
new file mode 100644
index 000000000..fdbf98e76
--- /dev/null
+++ b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c
@@ -0,0 +1,27 @@
+--- daapsharing/rb-daap-src.c.orig Sun Oct 16 05:50:21 2005
++++ daapsharing/rb-daap-src.c Mon Oct 17 10:30:20 2005
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#include <signal.h>
+
+ #include <libgnome/gnome-i18n.h>
+ #include <gst/gst.h>
+@@ -580,7 +581,15 @@ gst_tcp_socket_write (int socket, const
+ size_t bytes_written = 0;
+
+ while (bytes_written < count) {
+- ssize_t wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++ ssize_t wrote;
++#ifdef MSG_NOSIGNAL
++ wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++#else
++ signal (SIGPIPE, SIG_IGN);
++ wrote = send (socket, buf + bytes_written, count - bytes_written, 0);
++ signal (SIGPIPE, SIG_DFL);
++#endif
++
+
+ if (wrote <= 0) {
+ return bytes_written;
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 40faf0c09..0ff3e3fd9 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -3,6 +3,7 @@ lib/bonobo/librb-nautilus-context-menu.so
libdata/bonobo/servers/GNOME_Rhythmbox.server
libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
libdata/pkgconfig/rhythmbox.pc
+share/dbus-1/services/org.gnome.Rhythmbox.service
share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/authors.xml
@@ -80,31 +81,12 @@ share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-ja.omf
share/gnome/pixmaps/rhythmbox.png
share/gnome/rhythmbox/art/about-logo.png
-share/gnome/rhythmbox/art/rhythmbox-album.png
-share/gnome/rhythmbox/art/rhythmbox-audiocd.png
-share/gnome/rhythmbox/art/rhythmbox-automatic-playlist.png
-share/gnome/rhythmbox/art/rhythmbox-dnd.png
-share/gnome/rhythmbox/art/rhythmbox-ipod.png
-share/gnome/rhythmbox/art/rhythmbox-iradio.png
-share/gnome/rhythmbox/art/rhythmbox-library.png
share/gnome/rhythmbox/art/rhythmbox-no-star.png
-share/gnome/rhythmbox/art/rhythmbox-paused.png
-share/gnome/rhythmbox/art/rhythmbox-playback-error.png
-share/gnome/rhythmbox/art/rhythmbox-playing.png
-share/gnome/rhythmbox/art/rhythmbox-playlist-menu.png
-share/gnome/rhythmbox/art/rhythmbox-playlist.png
-share/gnome/rhythmbox/art/rhythmbox-repeat.png
share/gnome/rhythmbox/art/rhythmbox-set-star.png
-share/gnome/rhythmbox/art/rhythmbox-shuffle.png
share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
share/gnome/rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/rhythmbox/art/rhythmbox-visuals.png
-share/gnome/rhythmbox/art/rhythmbox-volume-max.png
-share/gnome/rhythmbox/art/rhythmbox-volume-medium.png
-share/gnome/rhythmbox/art/rhythmbox-volume-min.png
-share/gnome/rhythmbox/art/rhythmbox-volume-mute.png
-share/gnome/rhythmbox/art/rhythmbox-volume-zero.png
share/gnome/rhythmbox/glade/create-playlist.glade
+share/gnome/rhythmbox/glade/daap-prefs.glade
share/gnome/rhythmbox/glade/druid.glade
share/gnome/rhythmbox/glade/general-prefs.glade
share/gnome/rhythmbox/glade/library-prefs.glade
@@ -152,6 +134,7 @@ share/locale/ml/LC_MESSAGES/rhythmbox.mo
share/locale/mn/LC_MESSAGES/rhythmbox.mo
share/locale/ms/LC_MESSAGES/rhythmbox.mo
share/locale/nb/LC_MESSAGES/rhythmbox.mo
+share/locale/ne/LC_MESSAGES/rhythmbox.mo
share/locale/nl/LC_MESSAGES/rhythmbox.mo
share/locale/no/LC_MESSAGES/rhythmbox.mo
share/locale/pa/LC_MESSAGES/rhythmbox.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 05:39:27 +0800