From 5f94b9bffd724723454637418caa64865d872bbd Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 2 Feb 2006 09:13:38 +0000 Subject: Update to 0.9.3. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5605 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/rhythmbox/Makefile | 21 +++++++---- audio/rhythmbox/distinfo | 6 ++-- audio/rhythmbox/files/patch-configure | 41 +++++++--------------- .../files/patch-daapsharing_rb-daap-src.c | 21 ++++++----- audio/rhythmbox/files/patch-shell_main.c | 11 ------ 5 files changed, 40 insertions(+), 60 deletions(-) delete mode 100644 audio/rhythmbox/files/patch-shell_main.c (limited to 'audio/rhythmbox') diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 68f471346..33f75b489 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.44 2006/01/20 02:55:57 ahze Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.45 2006/01/24 21:17:56 ahze Exp $ # PORTNAME= rhythmbox -PORTVERSION= 0.9.2 -PORTREVISION= 3 +PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 @@ -27,7 +27,7 @@ USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner -USE_GSTREAMER80= flac mad gnomevfs gconf jpeg +USE_GSTREAMER= flac mad gnomevfs gconf jpeg USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-nautilus-menu CONFIGURE_ENV= LIBS="-lm" \ @@ -38,7 +38,8 @@ GCONF_SCHEMAS= rhythmbox.schemas OPTIONS= IPOD "Enable iPod support" off \ DAAP "Enable iTunes music sharing" off \ - FAAD "Enable FAAD decoder support" off + FAAD "Enable FAAD decoder support" off \ + NOTIFY "Enable libnotify support" on .include @@ -55,13 +56,13 @@ WITH_VORBIS= yes .endif .ifdef (WITH_VORBIS) -USE_GSTREAMER80+= vorbis +USE_GSTREAMER+= vorbis .else CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest .endif .if defined(WITH_FAAD) -USE_GSTREAMER80+= faad +USE_GSTREAMER+= faad .endif .if defined(WITH_DAAP) @@ -75,6 +76,12 @@ LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi CONFIGURE_ARGS+= --disable-daap .endif +.if !defined(WITHOUT_NOTIFY) +LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +.else +CONFIGURE_ARGS+= --disable-libnotify +.endif + pre-everything:: .if !defined(WITH_VORBIS) @${ECHO_MSG} diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo index 59542bb7b..d93be2f23 100644 --- a/audio/rhythmbox/distinfo +++ b/audio/rhythmbox/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/rhythmbox-0.9.2.tar.bz2) = 533223578c9c37bd72634755b33beab7 -SHA256 (gnome2/rhythmbox-0.9.2.tar.bz2) = 08e8ee10c0dc48f293b1e58cb5babaac9bfdf2df4e12aea76824ec3c6f4d0340 -SIZE (gnome2/rhythmbox-0.9.2.tar.bz2) = 2470164 +MD5 (gnome2/rhythmbox-0.9.3.tar.bz2) = 3ad98939192d44e64982588b15827ffe +SHA256 (gnome2/rhythmbox-0.9.3.tar.bz2) = fa8fda4f02391426ee3d854cebf11e6e000dc6f6b9fd96b15b5193cb53140a08 +SIZE (gnome2/rhythmbox-0.9.3.tar.bz2) = 2510119 diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure index 088e5eaea..16297b133 100644 --- a/audio/rhythmbox/files/patch-configure +++ b/audio/rhythmbox/files/patch-configure @@ -1,33 +1,18 @@ ---- configure.orig Mon Nov 28 13:42:56 2005 -+++ configure Mon Nov 28 13:44:13 2005 -@@ -22409,7 +22409,7 @@ +--- configure.orig Thu Feb 2 02:03:39 2006 ++++ configure Thu Feb 2 02:04:34 2006 +@@ -21318,9 +21318,9 @@ 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 -@@ -22426,7 +22426,7 @@ - _ACEOF - - use_ipod=yes -- if test x$enable_hal05 == xyes; then -+ if test x$enable_hal05 = xyes; then + 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 +- if test x$enable_hal05 == xyes; then ++ if test x$enable_hal05 = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_HAL_0_5 1 -@@ -22748,7 +22748,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 -@@ -23002,7 +23002,7 @@ +@@ -22121,7 +22121,7 @@ have_avahi_05=yes fi fi @@ -36,7 +21,7 @@ have_avahi=yes else have_avahi=no -@@ -23089,7 +23089,7 @@ +@@ -22208,7 +22208,7 @@ { echo "$as_me:$LINENO: Detected Avahi, using it for mDNS/DNS-SD" >&5 echo "$as_me: Detected Avahi, using it for mDNS/DNS-SD" >&6;} @@ -45,7 +30,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_AVAHI_0_6 1 -@@ -23156,7 +23156,7 @@ +@@ -22275,7 +22275,7 @@ { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5 echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;} @@ -54,7 +39,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_AVAHI_0_6 1 -@@ -23811,7 +23811,7 @@ +@@ -23069,7 +23069,7 @@ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then diff --git a/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c index fdbf98e76..02b36912b 100644 --- a/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c +++ b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c @@ -1,27 +1,26 @@ ---- 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 +--- daapsharing/rb-daap-src.c.orig Fri Jan 27 21:11:13 2006 ++++ daapsharing/rb-daap-src.c Thu Feb 2 02:07:48 2006 @@ -34,6 +34,7 @@ #include #include #include +#include + #include - #include - #include -@@ -580,7 +581,15 @@ gst_tcp_socket_write (int socket, const + #include +@@ -435,7 +436,14 @@ rb_daap_src_write (RBDAAPSrc *src, 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 = send (src->sock_fd, 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); ++ wrote = send (src->sock_fd, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL); +#else + signal (SIGPIPE, SIG_IGN); -+ wrote = send (socket, buf + bytes_written, count - bytes_written, 0); ++ wrote = send (src->sock_fd, buf + bytes_written, count - bytes_written, 0); + signal (SIGPIPE, SIG_DFL); +#endif -+ - if (wrote <= 0) { - return bytes_written; + if (wrote < 0) { + GST_WARNING ("error while writing: %s", g_strerror (errno)); diff --git a/audio/rhythmbox/files/patch-shell_main.c b/audio/rhythmbox/files/patch-shell_main.c deleted file mode 100644 index 3d612ad04..000000000 --- a/audio/rhythmbox/files/patch-shell_main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/main.c.orig Sat Dec 31 14:09:43 2005 -+++ shell/main.c Sat Dec 31 14:09:54 2005 -@@ -266,7 +266,7 @@ main (int argc, char **argv) - G_TYPE_STRING, - "org.gnome.Rhythmbox", - G_TYPE_UINT, -- DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, -+ DBUS_NAME_FLAG_DO_NOT_QUEUE, - G_TYPE_INVALID, - G_TYPE_UINT, - &request_name_reply, -- cgit v1.2.3