ports/72841: [PATCH] multimedia/totem: update to 0.99.19

Michael Johnson ahze at ahze.net
Mon Oct 18 20:00:40 UTC 2004 

>Number:         72841
>Category:       ports
>Synopsis:       [PATCH] multimedia/totem: update to 0.99.19
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 18 20:00:39 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Johnson
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-STABLE FreeBSD 5.3-STABLE #68: Sat Oct 16 21:30:18 EDT 2004
>Description:
- Update to 0.99.19

This will only work with gnome2.8 so if you want to test it you will
need gnome 2.8 installed =)

Added file(s):
- files/patch-src_totem-disc.c

Port maintainer (hendrik at scholz.net) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- totem-0.99.19.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/totem.orig/Makefile /usr/ports/multimedia/totem/Makefile
--- /usr/ports/multimedia/totem.orig/Makefile	Mon Oct 18 14:11:12 2004
+++ /usr/ports/multimedia/totem/Makefile	Mon Oct 18 14:27:05 2004
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	0.99.15.1
+PORTVERSION=	0.99.19
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/.....$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/...$//}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	hendrik at scholz.net
 COMMENT=	A Xine-based video player for the Gnome 2 Desktop
 
+LIB_DEPENDS=	nautilus-burn.0:${PORTSDIR}/sysutils/nautilus-cd-burner
+
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -53,7 +55,6 @@
 .endif
 .endif
 
-.if defined(WITH_GSTREAMER_OVERRIDE)
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
@@ -63,24 +64,20 @@
 DEFAULT_DVD_DEVICE=/dev/acd0
 .endif
 .endif
-.endif
 
 pre-everything::
 	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
 	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
 	@${ECHO_MSG} "===>"
-.if defined(WITH_GSTREAMER_OVERRIDE)
 	@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/src/cd-drive.c \
 		${WRKSRC}/src/totem-preferences.c \
-		${WRKSRC}/src/bacon-cd-selection.c
+		${WRKSRC}/src/bacon-video-widget-gst.c
 .if defined(WITH_GSTREAMER_OVERRIDE)
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 		${WRKSRC}/src/bacon-video-widget-gst.c
diff -ruN --exclude=CVS /usr/ports/multimedia/totem.orig/distinfo /usr/ports/multimedia/totem/distinfo
--- /usr/ports/multimedia/totem.orig/distinfo	Mon Oct 18 14:11:12 2004
+++ /usr/ports/multimedia/totem/distinfo	Mon Oct 18 12:49:35 2004
@@ -1,2 +1,2 @@
-MD5 (gnome2/totem-0.99.15.1.tar.bz2) = c5db3ea18fc66afce61e959c255706c7
-SIZE (gnome2/totem-0.99.15.1.tar.bz2) = 1025252
+MD5 (gnome2/totem-0.99.19.tar.bz2) = e2d8c6cd39b0843d51d357cc3921873a
+SIZE (gnome2/totem-0.99.19.tar.bz2) = 1062379
diff -ruN --exclude=CVS /usr/ports/multimedia/totem.orig/files/patch-src_totem-disc.c /usr/ports/multimedia/totem/files/patch-src_totem-disc.c
--- /usr/ports/multimedia/totem.orig/files/patch-src_totem-disc.c	Wed Dec 31 19:00:00 1969
+++ /usr/ports/multimedia/totem/files/patch-src_totem-disc.c	Mon Oct 18 14:16:57 2004
@@ -0,0 +1,49 @@
+--- src/totem-disc.c.orig	Mon Oct 18 14:00:05 2004
++++ src/totem-disc.c	Mon Oct 18 14:00:14 2004
+@@ -26,12 +26,34 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <mntent.h>
+ #include <string.h>
+ 
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++
++#ifdef __FreeBSD__
++#include <sys/cdio.h>
++#include <sys/disklabel.h>
++
++#define CDROM_DRIVE_STATUS      0x5326
++#define CDROM_DISC_STATUS       0x5327
++#define CDS_AUDIO               100
++#define CDS_MIXED               105
++#define CDS_DATA_1              101
++#define CDS_DATA_2              102
++#define CDS_NO_INFO             0       /* if not implemented */
++#define CDS_NO_DISC             1
++#define CDS_TRAY_OPEN           2
++#define CDS_DRIVE_NOT_READY     3
++#define CDS_DISC_OK             4
++#define CDS_XA_2_1              103
++#define CDS_XA_2_2              104
++#define ENOMEDIUM ENODEV
++#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
++#else
+ #include <linux/cdrom.h>
++#include <mntent.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -395,8 +417,10 @@
+   /* open disc, check capabilities and open mount */
+   if (!cd_cache_open_device (cache, error))
+     return MEDIA_TYPE_ERROR;
++#ifdef __linux__
+   if (!(cache->cap & CDC_DVD))
+     return MEDIA_TYPE_DATA;
++#endif
+   if (!(dir = cd_cache_open_mountpoint (cache, error)))
+     return MEDIA_TYPE_ERROR;
+ 
diff -ruN --exclude=CVS /usr/ports/multimedia/totem.orig/pkg-plist /usr/ports/multimedia/totem/pkg-plist
--- /usr/ports/multimedia/totem.orig/pkg-plist	Mon Oct 18 14:11:12 2004
+++ /usr/ports/multimedia/totem/pkg-plist	Mon Oct 18 14:07:20 2004
@@ -1,5 +1,8 @@
 bin/totem
 bin/totem-video-thumbnailer
+ at unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/totem-handlers.schemas >/dev/null || /usr/bin/true
+etc/gconf/schemas/totem-handlers.schemas
+ at exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/totem-handlers.schemas >/dev/null || /usr/bin/true
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/totem-video-thumbnail.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/totem-video-thumbnail.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/totem-video-thumbnail.schemas > /dev/null || /usr/bin/true
@@ -94,6 +97,7 @@
 share/locale/fi/LC_MESSAGES/totem.mo
 share/locale/fr/LC_MESSAGES/totem.mo
 share/locale/ga/LC_MESSAGES/totem.mo
+share/locale/gu/LC_MESSAGES/totem.mo
 share/locale/he/LC_MESSAGES/totem.mo
 share/locale/hr/LC_MESSAGES/totem.mo
 share/locale/hu/LC_MESSAGES/totem.mo
@@ -106,6 +110,7 @@
 share/locale/mk/LC_MESSAGES/totem.mo
 share/locale/ml/LC_MESSAGES/totem.mo
 share/locale/ms/LC_MESSAGES/totem.mo
+share/locale/nb/LC_MESSAGES/totem.mo
 share/locale/nl/LC_MESSAGES/totem.mo
 share/locale/no/LC_MESSAGES/totem.mo
 share/locale/pl/LC_MESSAGES/totem.mo
@@ -114,6 +119,7 @@
 share/locale/ro/LC_MESSAGES/totem.mo
 share/locale/ru/LC_MESSAGES/totem.mo
 share/locale/sk/LC_MESSAGES/totem.mo
+share/locale/sq/LC_MESSAGES/totem.mo
 share/locale/sr/LC_MESSAGES/totem.mo
 share/locale/sr at Latn/LC_MESSAGES/totem.mo
 share/locale/sv/LC_MESSAGES/totem.mo
--- totem-0.99.19.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list