Attachment #47561 for bug #72841

View | Details | Raw Unified | Return to bug 72841
Collapse All | Expand All

Lines 6-20 Link Here

(-)/usr/ports/multimedia/totem/Makefile (-8 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= totem	8	PORTNAME= totem
9	PORTVERSION= 0.99.15.1	9	PORTVERSION= 0.99.19
10	CATEGORIES= multimedia gnome	10	CATEGORIES= multimedia gnome
11	MASTER_SITES= ${MASTER_SITE_GNOME}	11	MASTER_SITES= ${MASTER_SITE_GNOME}
12	MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/.....$//}	12	MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/...$//}
13	DIST_SUBDIR= gnome2	13	DIST_SUBDIR= gnome2
14		14
15	MAINTAINER= hendrik@scholz.net	15	MAINTAINER= hendrik@scholz.net
16	COMMENT= A Xine-based video player for the Gnome 2 Desktop	16	COMMENT= A Xine-based video player for the Gnome 2 Desktop
17		17
		18	LIB_DEPENDS= nautilus-burn.0:${PORTSDIR}/sysutils/nautilus-cd-burner
		19
18	USE_REINPLACE= yes	20	USE_REINPLACE= yes
19	USE_BZIP2= yes	21	USE_BZIP2= yes
20	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes
Lines 53-59 Link Here
53	.endif	55	.endif
54	.endif	56	.endif
55		57
56	.if defined(WITH_GSTREAMER_OVERRIDE)
57	.if defined(WITH_DVD_DEVICE)	58	.if defined(WITH_DVD_DEVICE)
58	DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}	59	DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
59	.else	60	.else
Lines 63-86 Link Here
63	DEFAULT_DVD_DEVICE=/dev/acd0	64	DEFAULT_DVD_DEVICE=/dev/acd0
64	.endif	65	.endif
65	.endif	66	.endif
66	.endif
67		67
68	pre-everything::	68	pre-everything::
69	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"	69	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
70	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"	70	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
71	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"	71	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
72	@${ECHO_MSG} "===>"	72	@${ECHO_MSG} "===>"
73	.if defined(WITH_GSTREAMER_OVERRIDE)
74	@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"	73	@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
75	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"	74	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
76	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"	75	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
77	.endif
78		76
79	post-patch:	77	post-patch:
80	@${REINPLACE_CMD} -e 's\|/dev/cdrom\|${DEFAULT_CDROM_DEVICE}\|' \	78	@${REINPLACE_CMD} -e 's\|/dev/cdrom\|${DEFAULT_CDROM_DEVICE}\|' \
81	${WRKSRC}/src/cd-drive.c \
82	${WRKSRC}/src/totem-preferences.c \	79	${WRKSRC}/src/totem-preferences.c \
83	${WRKSRC}/src/bacon-cd-selection.c	80	${WRKSRC}/src/bacon-video-widget-gst.c
84	.if defined(WITH_GSTREAMER_OVERRIDE)	81	.if defined(WITH_GSTREAMER_OVERRIDE)
85	@${REINPLACE_CMD} -e 's\|/dev/dvd\|${DEFAULT_DVD_DEVICE}\|' \	82	@${REINPLACE_CMD} -e 's\|/dev/dvd\|${DEFAULT_DVD_DEVICE}\|' \
86	${WRKSRC}/src/bacon-video-widget-gst.c	83	${WRKSRC}/src/bacon-video-widget-gst.c

Lines 1-2 Link Here

(-)/usr/ports/multimedia/totem/distinfo (-2 / +2 lines)
1	MD5 (gnome2/totem-0.99.15.1.tar.bz2) = c5db3ea18fc66afce61e959c255706c7	1	MD5 (gnome2/totem-0.99.19.tar.bz2) = e2d8c6cd39b0843d51d357cc3921873a
2	SIZE (gnome2/totem-0.99.15.1.tar.bz2) = 1025252	2	SIZE (gnome2/totem-0.99.19.tar.bz2) = 1062379




--- 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;
 

Return to bug 72841

Line 0 Link Here

(-)/usr/ports/multimedia/totem/files/patch-src_totem-disc.c (+49 lines)
	1	--- src/totem-disc.c.orig Mon Oct 18 14:00:05 2004
	2	+++ src/totem-disc.c Mon Oct 18 14:00:14 2004
	3	@@ -26,12 +26,34 @@
	4	#include <stdlib.h>
	5	#include <unistd.h>
	6	#include <errno.h>
	7	-#include <mntent.h>
	8	#include <string.h>
	9
	10	#include <sys/ioctl.h>
	11	#include <sys/stat.h>
	12	+
	13	+#ifdef __FreeBSD__
	14	+#include <sys/cdio.h>
	15	+#include <sys/disklabel.h>
	16	+
	17	+#define CDROM_DRIVE_STATUS 0x5326
	18	+#define CDROM_DISC_STATUS 0x5327
	19	+#define CDS_AUDIO 100
	20	+#define CDS_MIXED 105
	21	+#define CDS_DATA_1 101
	22	+#define CDS_DATA_2 102
	23	+#define CDS_NO_INFO 0 /* if not implemented */
	24	+#define CDS_NO_DISC 1
	25	+#define CDS_TRAY_OPEN 2
	26	+#define CDS_DRIVE_NOT_READY 3
	27	+#define CDS_DISC_OK 4
	28	+#define CDS_XA_2_1 103
	29	+#define CDS_XA_2_2 104
	30	+#define ENOMEDIUM ENODEV
	31	+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
	32	+#else
	33	#include <linux/cdrom.h>
	34	+#include <mntent.h>
	35	+#endif
	36
	37	#include <glib.h>
	38	#include <glib/gi18n.h>
	39	@@ -395,8 +417,10 @@
	40	/* open disc, check capabilities and open mount */
	41	if (!cd_cache_open_device (cache, error))
	42	return MEDIA_TYPE_ERROR;
	43	+#ifdef __linux__
	44	if (!(cache->cap & CDC_DVD))
	45	return MEDIA_TYPE_DATA;
	46	+#endif
	47	if (!(dir = cd_cache_open_mountpoint (cache, error)))
	48	return MEDIA_TYPE_ERROR;
	49

Lines 1-5 Link Here

(-)/usr/ports/multimedia/totem/pkg-plist (+6 lines)
1	bin/totem	1	bin/totem
2	bin/totem-video-thumbnailer	2	bin/totem-video-thumbnailer
		3	@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
		4	etc/gconf/schemas/totem-handlers.schemas
		5	@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
3	@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	6	@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
4	etc/gconf/schemas/totem-video-thumbnail.schemas	7	etc/gconf/schemas/totem-video-thumbnail.schemas
5	@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	8	@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
Lines 94-99 Link Here
94	share/locale/fi/LC_MESSAGES/totem.mo	97	share/locale/fi/LC_MESSAGES/totem.mo
95	share/locale/fr/LC_MESSAGES/totem.mo	98	share/locale/fr/LC_MESSAGES/totem.mo
96	share/locale/ga/LC_MESSAGES/totem.mo	99	share/locale/ga/LC_MESSAGES/totem.mo
		100	share/locale/gu/LC_MESSAGES/totem.mo
97	share/locale/he/LC_MESSAGES/totem.mo	101	share/locale/he/LC_MESSAGES/totem.mo
98	share/locale/hr/LC_MESSAGES/totem.mo	102	share/locale/hr/LC_MESSAGES/totem.mo
99	share/locale/hu/LC_MESSAGES/totem.mo	103	share/locale/hu/LC_MESSAGES/totem.mo
Lines 106-111 Link Here
106	share/locale/mk/LC_MESSAGES/totem.mo	110	share/locale/mk/LC_MESSAGES/totem.mo
107	share/locale/ml/LC_MESSAGES/totem.mo	111	share/locale/ml/LC_MESSAGES/totem.mo
108	share/locale/ms/LC_MESSAGES/totem.mo	112	share/locale/ms/LC_MESSAGES/totem.mo
		113	share/locale/nb/LC_MESSAGES/totem.mo
109	share/locale/nl/LC_MESSAGES/totem.mo	114	share/locale/nl/LC_MESSAGES/totem.mo
110	share/locale/no/LC_MESSAGES/totem.mo	115	share/locale/no/LC_MESSAGES/totem.mo
111	share/locale/pl/LC_MESSAGES/totem.mo	116	share/locale/pl/LC_MESSAGES/totem.mo
Lines 114-119 Link Here
114	share/locale/ro/LC_MESSAGES/totem.mo	119	share/locale/ro/LC_MESSAGES/totem.mo
115	share/locale/ru/LC_MESSAGES/totem.mo	120	share/locale/ru/LC_MESSAGES/totem.mo
116	share/locale/sk/LC_MESSAGES/totem.mo	121	share/locale/sk/LC_MESSAGES/totem.mo
		122	share/locale/sq/LC_MESSAGES/totem.mo
117	share/locale/sr/LC_MESSAGES/totem.mo	123	share/locale/sr/LC_MESSAGES/totem.mo
118	share/locale/sr@Latn/LC_MESSAGES/totem.mo	124	share/locale/sr@Latn/LC_MESSAGES/totem.mo
119	share/locale/sv/LC_MESSAGES/totem.mo	125	share/locale/sv/LC_MESSAGES/totem.mo