4 files changed, 102 insertions, 9 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 8cecbf0f9cb7..45a7bd07a3b3 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	2.22.0
-PORTREVISION?=	1
+PORTVERSION=	2.22.1
+PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,8 +20,10 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 LIB_DEPENDS=	musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
+		${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata
 
+USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
@@ -46,12 +48,34 @@ CONFLICTS?=	totem-gstreamer-[0-9]* totem-xine-[0-9]*
 
 OPTIONS=	LIRC "Enable lirc support" off \
 		GALAGO "Enable Galago support" off \
-		GECKO_PLUGINS "Enable install plugins for gecko browser" on
+		GECKO_PLUGINS "Enable install plugins for gecko browser" on \
+		PUBLISH "Enable Publish (network playlist) plugin" off \
+		TRACKER "Enable tracker local search plugin" off
 
-TOTEM_PLUGINS=	screensaver ontop gromit media-player-keys properties sidebar-test skipto
+# check configure script for allowed_plugins="..." for new plugins
+TOTEM_PLUGINS=	thumbnail screensaver ontop gromit media-player-keys \
+		properties skipto youtube
+# Not using:
+# TOTEM_PLUGINS= mythtv bemused
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_PUBLISH)
+LIB_DEPENDS+=	epc-1.0.1:${PORTSDIR}/www/libepc
+PLIST_SUB+=	PUBLISH=""
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} publish
+.else
+PLIST_SUB+=	PUBLISH="@comment "
+.endif
+
+.if defined(WITH_TRACKER)
+LIB_DEPENDS+=	tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} tracker
+PLIST_SUB+=	TRACKER=""
+.else
+PLIST_SUB+=	TRACKER="@comment "
+.endif
+
 .if defined(WITH_LIRC)
 LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
@@ -90,7 +114,7 @@ PLIST_SUB+=	GECKO_PLUGINS="@comment "
 
 .if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no"
 CONFIGURE_ARGS+=--enable-gstreamer=yes
-USE_GSTREAMER+=	gnomevfs core gconf hal good mpeg2dec ugly
+USE_GSTREAMER+=	core gconf hal good mpeg2dec soup ugly python gio
 WITHOUT_DVDNAV=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 8be34337d3d9..0e4f1ecac73d 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.22.0.tar.bz2) = 21a3f983e762b34db035edbaaba9dd63
-SHA256 (gnome2/totem-2.22.0.tar.bz2) = b0f9dd826089fc976ed4e57723613fb518f84e79c3f7cc7a0814b7254911f351
-SIZE (gnome2/totem-2.22.0.tar.bz2) = 2321288
+MD5 (gnome2/totem-2.22.1.tar.bz2) = f4920ffef2a90f019ff7e9d6a411e532
+SHA256 (gnome2/totem-2.22.1.tar.bz2) = 345a0960532e0d74c23fd4720a8db4649300b5d09ac87d8d8aaa6be3e45ccc2f
+SIZE (gnome2/totem-2.22.1.tar.bz2) = 2403707
diff --git a/multimedia/totem/files/patch-src_plugins_youtube_youtube.py b/multimedia/totem/files/patch-src_plugins_youtube_youtube.py
new file mode 100644
index 000000000000..361ef6b84997
--- /dev/null
+++ b/multimedia/totem/files/patch-src_plugins_youtube_youtube.py
@@ -0,0 +1,11 @@
+--- src/plugins/youtube/youtube.py.orig	2008-04-08 15:37:02.979444610 -0400
++++ src/plugins/youtube/youtube.py	2008-04-08 15:37:16.056825001 -0400
+@@ -52,7 +52,7 @@
+ 				import gst
+ 
+ 				registry = gst.registry_get_default ()
+-				if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("souphttpsrc") == None:
++				if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("soup") == None:
+ 					"""This means an error will be displayed when they try to play anything"""
+ 					self.gstreamer_plugins_present = False
+ 			except ImportError:
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 1d3ca28dc8f0..adbd789b65c8 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -49,6 +49,11 @@ lib/totem/plugins/ontop/libontop.a
 lib/totem/plugins/ontop/libontop.la
 lib/totem/plugins/ontop/libontop.so
 lib/totem/plugins/ontop/ontop.totem-plugin
+%%PUBLISH%%lib/totem/plugins/publish/libpublish.a
+%%PUBLISH%%lib/totem/plugins/publish/libpublish.la
+%%PUBLISH%%lib/totem/plugins/publish/libpublish.so
+%%PUBLISH%%lib/totem/plugins/publish/publish-plugin.ui
+%%PUBLISH%%lib/totem/plugins/publish/publish.totem-plugin
 lib/totem/plugins/properties/libmovie-properties.a
 lib/totem/plugins/properties/libmovie-properties.la
 lib/totem/plugins/properties/libmovie-properties.so
@@ -62,9 +67,22 @@ lib/totem/plugins/skipto/libskipto.la
 lib/totem/plugins/skipto/libskipto.so
 lib/totem/plugins/skipto/skipto.totem-plugin
 lib/totem/plugins/skipto/skipto.ui
+lib/totem/plugins/thumbnail/libthumbnail.a
+lib/totem/plugins/thumbnail/libthumbnail.la
+lib/totem/plugins/thumbnail/libthumbnail.so
+lib/totem/plugins/thumbnail/thumbnail.totem-plugin
+%%TRACKER%%lib/totem/plugins/tracker/libtracker.a
+%%TRACKER%%lib/totem/plugins/tracker/libtracker.la
+%%TRACKER%%lib/totem/plugins/tracker/libtracker.so
+%%TRACKER%%lib/totem/plugins/tracker/tracker.totem-plugin
 lib/totem/plugins/totem/__init__.py
 lib/totem/plugins/totem/__init__.pyc
 lib/totem/plugins/totem/__init__.pyo
+lib/totem/plugins/youtube/youtube.py
+lib/totem/plugins/youtube/youtube.pyc
+lib/totem/plugins/youtube/youtube.pyo
+lib/totem/plugins/youtube/youtube.totem-plugin
+lib/totem/plugins/youtube/youtube.ui
 %%GECKO_PLUGINS%%libexec/totem-plugin-viewer
 libexec/totem/totem-bugreport.py
 share/applications/totem.desktop
@@ -99,6 +117,15 @@ share/gnome/help/totem/de/figures/totem_start_window.png
 share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/de/figures/totem_volume_mute_button.png
 share/gnome/help/totem/de/totem.xml
+share/gnome/help/totem/el/figures/totem_next_button.png
+share/gnome/help/totem/el/figures/totem_pause_button.png
+share/gnome/help/totem/el/figures/totem_play_button.png
+share/gnome/help/totem/el/figures/totem_previous_button.png
+share/gnome/help/totem/el/figures/totem_show_playlist_button.png
+share/gnome/help/totem/el/figures/totem_start_window.png
+share/gnome/help/totem/el/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/el/figures/totem_volume_mute_button.png
+share/gnome/help/totem/el/totem.xml
 share/gnome/help/totem/en_GB/figures/totem_next_button.png
 share/gnome/help/totem/en_GB/figures/totem_pause_button.png
 share/gnome/help/totem/en_GB/figures/totem_play_button.png
@@ -189,6 +216,24 @@ share/gnome/help/totem/uk/figures/totem_start_window.png
 share/gnome/help/totem/uk/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/uk/figures/totem_volume_mute_button.png
 share/gnome/help/totem/uk/totem.xml
+share/gnome/help/totem/zh_HK/figures/totem_next_button.png
+share/gnome/help/totem/zh_HK/figures/totem_pause_button.png
+share/gnome/help/totem/zh_HK/figures/totem_play_button.png
+share/gnome/help/totem/zh_HK/figures/totem_previous_button.png
+share/gnome/help/totem/zh_HK/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_HK/figures/totem_start_window.png
+share/gnome/help/totem/zh_HK/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_HK/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_HK/totem.xml
+share/gnome/help/totem/zh_TW/figures/totem_next_button.png
+share/gnome/help/totem/zh_TW/figures/totem_pause_button.png
+share/gnome/help/totem/zh_TW/figures/totem_play_button.png
+share/gnome/help/totem/zh_TW/figures/totem_previous_button.png
+share/gnome/help/totem/zh_TW/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_TW/figures/totem_start_window.png
+share/gnome/help/totem/zh_TW/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_TW/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_TW/totem.xml
 share/icons/hicolor/16x16/apps/totem.png
 share/icons/hicolor/22x22/apps/totem.png
 share/icons/hicolor/24x24/apps/totem.png
@@ -278,6 +323,7 @@ share/omf/totem/totem-C.omf
 share/omf/totem/totem-bg.omf
 share/omf/totem/totem-ca.omf
 share/omf/totem/totem-de.omf
+share/omf/totem/totem-el.omf
 share/omf/totem/totem-en_GB.omf
 share/omf/totem/totem-es.omf
 share/omf/totem/totem-fr.omf
@@ -288,6 +334,8 @@ share/omf/totem/totem-pt_BR.omf
 share/omf/totem/totem-ru.omf
 share/omf/totem/totem-sv.omf
 share/omf/totem/totem-uk.omf
+share/omf/totem/totem-zh_HK.omf
+share/omf/totem/totem-zh_TW.omf
 %%DATADIR%%/filmholes-big-left.png
 %%DATADIR%%/filmholes-big-right.png
 %%DATADIR%%/filmholes.png
@@ -304,6 +352,10 @@ share/vala/vapi/totem.deps
 share/vala/vapi/totem.vapi
 @dirrm %%DATADIR%%
 @dirrm share/omf/totem
+@dirrm share/gnome/help/totem/zh_TW/figures
+@dirrm share/gnome/help/totem/zh_TW
+@dirrm share/gnome/help/totem/zh_HK/figures
+@dirrm share/gnome/help/totem/zh_HK
 @dirrm share/gnome/help/totem/uk/figures
 @dirrm share/gnome/help/totem/uk
 @dirrm share/gnome/help/totem/sv/figures
@@ -324,6 +376,8 @@ share/vala/vapi/totem.vapi
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/en_GB/figures
 @dirrm share/gnome/help/totem/en_GB
+@dirrm share/gnome/help/totem/el/figures
+@dirrm share/gnome/help/totem/el
 @dirrm share/gnome/help/totem/de/figures
 @dirrm share/gnome/help/totem/de
 @dirrm share/gnome/help/totem/ca/figures
@@ -334,9 +388,13 @@ share/vala/vapi/totem.vapi
 @dirrm share/gnome/help/totem/C
 @dirrm share/gnome/help/totem
 @dirrm libexec/totem
+@dirrm lib/totem/plugins/youtube
 @dirrm lib/totem/plugins/totem
+%%TRACKER%%@dirrm lib/totem/plugins/tracker
+@dirrm lib/totem/plugins/thumbnail
 @dirrm lib/totem/plugins/skipto
 @dirrm lib/totem/plugins/screensaver
+%%PUBLISH%%@dirrm lib/totem/plugins/publish
 @dirrm lib/totem/plugins/properties
 @dirrm lib/totem/plugins/ontop
 @dirrm lib/totem/plugins/media-player-keys