diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-24 00:53:37 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-24 00:53:37 +0800 |
commit | ab6621dc9e59876f67643c2e1c5895a5e3d6303f (patch) | |
tree | c6aa97d7943f78f440a992873a80ab439b8912bd /multimedia | |
parent | 41b15df2a0a521dc5acc80ce53de0b04ec86dd2c (diff) | |
download | marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar.gz marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar.bz2 marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar.lz marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar.xz marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.tar.zst marcuscom-ports-ab6621dc9e59876f67643c2e1c5895a5e3d6303f.zip |
Update to 0.100.
Add some patches from totem CVS to build against n-c-b > 2.9.0.
Next totem will be 2.9/2.10 only.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3465 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/totem-gstreamer/Makefile | 6 | ||||
-rw-r--r-- | multimedia/totem/Makefile | 16 | ||||
-rw-r--r-- | multimedia/totem/distinfo | 4 | ||||
-rw-r--r-- | multimedia/totem/files/patch-configure | 51 | ||||
-rw-r--r-- | multimedia/totem/files/patch-data_Makefile.in | 13 | ||||
-rw-r--r-- | multimedia/totem/files/patch-src_bacon-v4l-selection.h | 10 | ||||
-rw-r--r-- | multimedia/totem/files/patch-src_totem-preferences.c | 66 | ||||
-rw-r--r-- | multimedia/totem/files/patch-src_totem.c | 10 | ||||
-rw-r--r-- | multimedia/totem/pkg-plist | 11 |
9 files changed, 177 insertions, 10 deletions
diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile index e9f2a4fb5..d27db10dd 100644 --- a/multimedia/totem-gstreamer/Makefile +++ b/multimedia/totem-gstreamer/Makefile @@ -5,14 +5,16 @@ # $FreeBSD: ports/multimedia/totem-gstreamer/Makefile,v 1.1 2004/12/04 19:39:03 marcus Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -gstreamer MAINTAINER= gnome@FreeBSD.org COMMENT= A Gstreamer-based video player for the Gnome 2 desktop MASTERDIR= ${.CURDIR}/../totem -WITH_GSTREAMER_OVERRIDE= yes + +OPTIONS= +WITH_GSTREAMER= yes CONFLICTS= totem-[0-9]* diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index c5e67fd48..dd5af9e96 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -6,11 +6,11 @@ # PORTNAME= totem -PORTVERSION= 0.99.22 -PORTREVISION?= 2 +PORTVERSION= 0.100 +PORTREVISION?= 0 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/...$//} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER?= hendrik@scholz.net @@ -27,8 +27,10 @@ USE_LIBTOOL_VER=15 INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr" +CONFIGURE_ARGS+=--disable-mozilla -OPTIONS= DVDNAV "Enable DVD support" on +OPTIONS?= DVDNAV "Enable DVD support" on \ + GSTREAMER "Use Gstreamer instead of Xine" off MAN1= totem.1 GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ @@ -37,12 +39,14 @@ CONFLICTS= totem-gstreamer-[0-9]* .include <bsd.port.pre.mk> -.if defined(WITH_GSTREAMER_OVERRIDE) +.if defined(WITH_GSTREAMER) CONFIGURE_ARGS+=--enable-gstreamer USE_GSTREAMER+= gnomevfs core WITHOUT_DVDNAV= yes +PLIST_SUB= GSTREAMER="" .else LIB_DEPENDS+= xine.12:${PORTSDIR}/multimedia/libxine +PLIST_SUB= GSTREAMER="@comment " .endif .if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV) @@ -82,7 +86,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ ${WRKSRC}/src/totem-preferences.c \ ${WRKSRC}/src/bacon-video-widget-gst.c -.if defined(WITH_GSTREAMER_OVERRIDE) +.if defined(WITH_GSTREAMER) @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ ${WRKSRC}/src/bacon-video-widget-gst.c .endif diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index b19a28ebe..a2e694925 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/totem-0.99.22.tar.bz2) = 7843368e1e61921b0ae87a751ad91079 -SIZE (gnome2/totem-0.99.22.tar.bz2) = 1095821 +MD5 (gnome2/totem-0.100.tar.bz2) = 885423cc7e1d5eb8ff62b7b8ec9c30bc +SIZE (gnome2/totem-0.100.tar.bz2) = 1279913 diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure new file mode 100644 index 000000000..7d8111c86 --- /dev/null +++ b/multimedia/totem/files/patch-configure @@ -0,0 +1,51 @@ +--- configure.orig Sun Jan 23 11:47:50 2005 ++++ configure Sun Jan 23 11:49:37 2005 +@@ -19551,23 +19551,23 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libnautilus-burn < 2.9.0" >&5 +-echo $ECHO_N "checking for libnautilus-burn < 2.9.0... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libnautilus-burn > 2.9.0" >&5 ++echo $ECHO_N "checking for libnautilus-burn > 2.9.0... $ECHO_C" >&6 + +- if $PKG_CONFIG --exists "libnautilus-burn < 2.9.0" ; then ++ if $PKG_CONFIG --exists "libnautilus-burn > 2.9.0" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking NAUTILUS_BURN_CFLAGS" >&5 + echo $ECHO_N "checking NAUTILUS_BURN_CFLAGS... $ECHO_C" >&6 +- NAUTILUS_BURN_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-burn < 2.9.0"` ++ NAUTILUS_BURN_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-burn > 2.9.0"` + echo "$as_me:$LINENO: result: $NAUTILUS_BURN_CFLAGS" >&5 + echo "${ECHO_T}$NAUTILUS_BURN_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking NAUTILUS_BURN_LIBS" >&5 + echo $ECHO_N "checking NAUTILUS_BURN_LIBS... $ECHO_C" >&6 +- NAUTILUS_BURN_LIBS=`$PKG_CONFIG --libs "libnautilus-burn < 2.9.0"` ++ NAUTILUS_BURN_LIBS=`$PKG_CONFIG --libs "libnautilus-burn > 2.9.0"` + echo "$as_me:$LINENO: result: $NAUTILUS_BURN_LIBS" >&5 + echo "${ECHO_T}$NAUTILUS_BURN_LIBS" >&6 + else +@@ -19575,7 +19575,7 @@ + NAUTILUS_BURN_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- NAUTILUS_BURN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-burn < 2.9.0"` ++ NAUTILUS_BURN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-burn > 2.9.0"` + + fi + +@@ -19590,8 +19590,8 @@ + if test $succeeded = yes; then + : + else +- { { echo "$as_me:$LINENO: error: libnautilus-burn < 2.9.0 is needed" >&5 +-echo "$as_me: error: libnautilus-burn < 2.9.0 is needed" >&2;} ++ { { echo "$as_me:$LINENO: error: libnautilus-burn > 2.9.0 is needed" >&5 ++echo "$as_me: error: libnautilus-burn > 2.9.0 is needed" >&2;} + { (exit 1); exit 1; }; } + fi + diff --git a/multimedia/totem/files/patch-data_Makefile.in b/multimedia/totem/files/patch-data_Makefile.in new file mode 100644 index 000000000..f788b6d77 --- /dev/null +++ b/multimedia/totem/files/patch-data_Makefile.in @@ -0,0 +1,13 @@ +--- data/Makefile.in.orig Mon Jan 3 22:50:19 2005 ++++ data/Makefile.in Mon Jan 3 22:50:55 2005 +@@ -167,8 +167,8 @@ + + desktop_in_in_files_all = totem.desktop.in.in.in vanity.desktop.in.in + desktop_in_files_all = totem.desktop.in.in vanity.desktop.in +-@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in.in vanity.desktop.in +-@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in.in ++@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in vanity.desktop.in ++@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in + + desktopdir = $(datadir)/applications/ + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/multimedia/totem/files/patch-src_bacon-v4l-selection.h b/multimedia/totem/files/patch-src_bacon-v4l-selection.h new file mode 100644 index 000000000..f554ddb3c --- /dev/null +++ b/multimedia/totem/files/patch-src_bacon-v4l-selection.h @@ -0,0 +1,10 @@ +--- src/bacon-v4l-selection.h.orig Sun Jan 23 12:13:42 2005 ++++ src/bacon-v4l-selection.h Sun Jan 23 12:14:05 2005 +@@ -22,7 +22,6 @@ + #define HAVE_BACON_V4L_SELECTION_H + + #include <gtk/gtkcomboboxentry.h> +-#include <cd-drive.h> + + G_BEGIN_DECLS + diff --git a/multimedia/totem/files/patch-src_totem-preferences.c b/multimedia/totem/files/patch-src_totem-preferences.c new file mode 100644 index 000000000..c1d50d15c --- /dev/null +++ b/multimedia/totem/files/patch-src_totem-preferences.c @@ -0,0 +1,66 @@ +--- src/totem-preferences.c.orig Mon Jan 3 00:18:39 2005 ++++ src/totem-preferences.c Sun Jan 23 12:06:53 2005 +@@ -24,7 +24,7 @@ + #include <stdio.h> + #include <sys/stat.h> + #include <sys/types.h> +-#include <bacon-cd-selection.h> ++#include <nautilus-burn-drive-selection.h> + + #include "totem.h" + #include "totem-private.h" +@@ -210,11 +210,11 @@ + } + + static void +-on_combo_entry1_changed (BaconCdSelection *bcs, char *device, Totem *totem) ++on_combo_entry1_changed (NautilusBurnDriveSelection *bcs, char *device, Totem *totem) + { + const char *str; + +- str = bacon_cd_selection_get_device (bcs); ++ str = nautilus_burn_drive_selection_get_device (bcs); + gconf_client_set_string (totem->gc, GCONF_PREFIX"/mediadev", str, NULL); + bacon_video_widget_set_media_device + (BACON_VIDEO_WIDGET (totem->bvw), str); +@@ -271,9 +271,9 @@ + GCONF_PREFIX"/mediadev", NULL); + + if (mediadev == NULL || strcmp (mediadev, "") == 0) +- mediadev = g_strdup ("/dev/cdrom"); ++ mediadev = g_strdup ("/dev/acd0"); + +- bacon_cd_selection_set_device (BACON_CD_SELECTION (item), mediadev); ++ nautilus_burn_drive_selection_set_device (NAUTILUS_BURN_DRIVE_SELECTION (item), mediadev); + bacon_video_widget_set_media_device + (BACON_VIDEO_WIDGET (totem->bvw), mediadev); + +@@ -358,7 +358,7 @@ + { + GtkWidget *widget; + +- widget = bacon_cd_selection_new (); ++ widget = nautilus_burn_drive_selection_new (); + gtk_widget_show (widget); + + return widget; +@@ -480,8 +480,8 @@ + if (mediadev == NULL || (strcmp (mediadev, "") == 0) + || (strcmp (mediadev, "auto") == 0)) + { +- mediadev = g_strdup (bacon_cd_selection_get_default_device +- (BACON_CD_SELECTION (item))); ++ mediadev = g_strdup (nautilus_burn_drive_selection_get_default_device ++ (NAUTILUS_BURN_DRIVE_SELECTION (item))); + gconf_client_set_string (totem->gc, GCONF_PREFIX"/mediadev", + mediadev, NULL); + } +@@ -491,7 +491,7 @@ + g_signal_connect (G_OBJECT (item), "device-changed", + G_CALLBACK (on_combo_entry1_changed), totem); + +- bacon_cd_selection_set_device (BACON_CD_SELECTION (item), mediadev); ++ nautilus_burn_drive_selection_set_device (NAUTILUS_BURN_DRIVE_SELECTION (item), mediadev); + g_free (mediadev); + + /* Connection Speed */ diff --git a/multimedia/totem/files/patch-src_totem.c b/multimedia/totem/files/patch-src_totem.c new file mode 100644 index 000000000..591f2e2ef --- /dev/null +++ b/multimedia/totem/files/patch-src_totem.c @@ -0,0 +1,10 @@ +--- src/totem.c.orig Sun Jan 23 11:52:03 2005 ++++ src/totem.c Sun Jan 23 11:54:08 2005 +@@ -42,7 +42,6 @@ + #include "bacon-video-widget.h" + #include "bacon-video-widget-properties.h" + #include "rb-ellipsizing-label.h" +-#include "bacon-cd-selection.h" + #include "totem-statusbar.h" + #include "totem-time-label.h" + #include "totem-session.h" diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index c37924fdb..e8c406641 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -34,10 +34,15 @@ share/gnome/help/totem/es/figures/totem_volume_maximum_button.png share/gnome/help/totem/es/figures/totem_volume_mute_button.png share/gnome/help/totem/es/legal.xml share/gnome/help/totem/es/totem.xml +share/gnome/help/totem/ru/figures/totem_screenshot.png +share/gnome/help/totem/ru/figures/totem_start_window.png +share/gnome/help/totem/ru/legal.xml +share/gnome/help/totem/ru/totem.xml share/gnome/mime-info/totem.keys share/gnome/omf/totem/totem-C.omf share/gnome/omf/totem/totem-de.omf share/gnome/omf/totem/totem-es.omf +share/gnome/omf/totem/totem-ru.omf share/gnome/pixmaps/media-player-48.png share/gnome/pixmaps/vanity.png share/gnome/totem/filmholes-big-left.png @@ -53,6 +58,7 @@ share/gnome/totem/properties.glade share/gnome/totem/rhythmbox-volume-max.png share/gnome/totem/rhythmbox-volume-zero.png share/gnome/totem/screenshot.glade +share/gnome/totem/skip_to.glade share/gnome/totem/stock-tool-brightness-contrast-22.png share/gnome/totem/stock_media_next.png share/gnome/totem/stock_media_pause.png @@ -87,6 +93,7 @@ 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 +share/locale/id/LC_MESSAGES/totem.mo share/locale/is/LC_MESSAGES/totem.mo share/locale/it/LC_MESSAGES/totem.mo share/locale/ja/LC_MESSAGES/totem.mo @@ -117,6 +124,8 @@ share/locale/zh_CN/LC_MESSAGES/totem.mo share/locale/zh_TW/LC_MESSAGES/totem.mo @dirrm share/gnome/totem @dirrm share/gnome/omf/totem +@dirrm share/gnome/help/totem/ru/figures +@dirrm share/gnome/help/totem/ru @dirrm share/gnome/help/totem/es/figures @dirrm share/gnome/help/totem/es @dirrm share/gnome/help/totem/de/figures @@ -124,5 +133,7 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo @dirrm share/gnome/help/totem/C/figures @dirrm share/gnome/help/totem/C @dirrm share/gnome/help/totem +%%GSTREAMER%%@unexec rmdir lib/mozilla/plugins 2>/dev/null || /usr/bin/true +%%GSTREAMER%%@unexec rmdir lib/mozilla 2>/dev/null || /usr/bin/true @exec update-desktop-database > /dev/null || /usr/bin/true @unexec update-desktop-database > /dev/null || /usr/bin/true |