From e4a89406d90749d6d7a77276c422e670f14dcd7d Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 21 Jan 2006 08:06:36 +0000 Subject: Update to 2.13.7. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5490 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/gnomemedia2/Makefile | 6 +- audio/gnomemedia2/distinfo | 6 +- .../files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 49 --------- audio/gnomemedia2/pkg-plist | 114 ++++++++++----------- 4 files changed, 63 insertions(+), 112 deletions(-) delete mode 100644 audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c (limited to 'audio/gnomemedia2') diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 9acae4749..b3988236b 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/audio/gnomemedia2/Makefile,v 1.81 2006/01/17 01:03:47 ahze Exp $ +# $MCom: ports/audio/gnomemedia2/Makefile,v 1.82 2006/01/20 02:55:48 ahze Exp $ # PORTNAME= gnomemedia2 -PORTVERSION= 2.13.5 +PORTVERSION= 2.13.7 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.13 @@ -27,7 +27,7 @@ USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ gail nautiluscdburner -USE_GSTREAMER80= esound cdparanoia gconf +USE_GSTREAMER= esound gconf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index 839efd093..15ebe1382 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-media-2.13.5.tar.bz2) = 455c613e317347c546ce940b32bb79d1 -SHA256 (gnome2/gnome-media-2.13.5.tar.bz2) = 3a482704a6555ab05259f249e24add419e5b193a301e720614a838ba3e46bba7 -SIZE (gnome2/gnome-media-2.13.5.tar.bz2) = 3570260 +MD5 (gnome2/gnome-media-2.13.7.tar.bz2) = 4336c4522da890ae5e73031040dc719f +SHA256 (gnome2/gnome-media-2.13.7.tar.bz2) = c7c7107c5eff0fc3b5213d1e5a134de0b33258d2d58bae125636ef75f2081fcb +SIZE (gnome2/gnome-media-2.13.7.tar.bz2) = 2918731 diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c deleted file mode 100644 index 8d49db7bc..000000000 --- a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c +++ /dev/null @@ -1,49 +0,0 @@ ---- gnome-cd/gst-cdparanoia-cdrom.c.orig Mon Apr 4 16:25:49 2005 -+++ gnome-cd/gst-cdparanoia-cdrom.c Mon Apr 4 16:26:14 2005 -@@ -1224,6 +1224,16 @@ - *status = NULL; - return FALSE; - } -+#else -+ if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) { -+ realstatus->cd = GNOME_CDROM_STATUS_NO_DISC; -+ realstatus->audio = GNOME_CDROM_AUDIO_NOTHING; -+ realstatus->track = -1; -+ -+ gst_cdparanoia_cdrom_close (lcd); -+ return TRUE; -+ } -+ realstatus->cd = GNOME_CDROM_STATUS_OK; - #endif - - gst_cdparanoia_cdrom_close (lcd); -@@ -1421,15 +1431,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) { -@@ -1441,6 +1454,7 @@ - } - - close (fd); -+#endif /* __FreeBSD__ */ - - return TRUE; - } diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index d90d015d2..3f75c5293 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -377,59 +377,59 @@ share/gnome/pixmaps/gnome-cd/disc.png share/gnome/pixmaps/gnome-cd/media-eject.png share/gnome/pixmaps/gnome-cd/once.png share/gnome/pixmaps/gnome-cd/repeat.png -share/gnome/pixmaps/gnome-cd/themes/None/None.theme -share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png -share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png -share/gnome/pixmaps/gnome-cd/themes/None/bottom.png -share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png -share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png -share/gnome/pixmaps/gnome-cd/themes/None/media-next.png -share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png -share/gnome/pixmaps/gnome-cd/themes/None/media-play.png -share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png -share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png -share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png -share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png -share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png -share/gnome/pixmaps/gnome-cd/themes/None/middle.png -share/gnome/pixmaps/gnome-cd/themes/None/top-left.png -share/gnome/pixmaps/gnome-cd/themes/None/top-right.png -share/gnome/pixmaps/gnome-cd/themes/None/top.png -share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png -share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png -share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png -share/gnome/pixmaps/gnome-cd/themes/lcd/lcd.theme -share/gnome/pixmaps/gnome-cd/themes/lcd/middle-left.png -share/gnome/pixmaps/gnome-cd/themes/lcd/middle-right.png -share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png -share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png -share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png -share/gnome/pixmaps/gnome-cd/themes/lcd/top.png -share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png -share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png -share/gnome/pixmaps/gnome-cd/themes/media/bottom.png -share/gnome/pixmaps/gnome-cd/themes/media/media.theme -share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png -share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png -share/gnome/pixmaps/gnome-cd/themes/media/middle.png -share/gnome/pixmaps/gnome-cd/themes/media/top-left.png -share/gnome/pixmaps/gnome-cd/themes/media/top-right.png -share/gnome/pixmaps/gnome-cd/themes/media/top.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-left.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-right.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme -share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/None.theme +share/gnome/pixmaps/gnome-cd/themes/None-theme/a-eject-menu.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/a-first-menu.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/a-last-menu.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/a-play-menu.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/a-stop-menu.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/bottom.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-eject.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-fwd.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-next.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-pause.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-play.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-prev.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-rew.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/media-stop.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/middle.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/top-left.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/top-right.png +share/gnome/pixmaps/gnome-cd/themes/None-theme/top.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/bottom.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/lcd.theme +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/middle.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/top-left.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/top-right.png +share/gnome/pixmaps/gnome-cd/themes/lcd-theme/top.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/bottom.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/media.theme +share/gnome/pixmaps/gnome-cd/themes/media-theme/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/middle.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/top-left.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/top-right.png +share/gnome/pixmaps/gnome-cd/themes/media-theme/top.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/bottom.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/middle.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/red-lcd.theme +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/top-left.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/top-right.png +share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme/top.png share/gnome/pixmaps/gnome-cd/track.png share/gnome/pixmaps/gnome-grecord.png share/gnome/pixmaps/gnome-mixer.png @@ -504,10 +504,10 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo -@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd -@dirrm share/gnome/pixmaps/gnome-cd/themes/media -@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd -@dirrm share/gnome/pixmaps/gnome-cd/themes/None +@dirrm share/gnome/pixmaps/gnome-cd/themes/None-theme +@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd-theme +@dirrm share/gnome/pixmaps/gnome-cd/themes/media-theme +@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd-theme @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd @dirrm share/gnome/omf/gnome-media -- cgit v1.2.3