Update totem and totem-xine to 1.2.0:

New features and significant updates in version...

1.2.0:
* New French (fr) translation of the help files
* Fix problems with the nautilus property window not getting translated
  properly
* Add missing strings for translation
* Remove warnings when exiting early because audio or video outputs
  aren't available (GStreamer)
* Fix the visualisations not running on startup (xine-lib)
* Correctly change the visualisation plugin when it's not currently in use
  (xine-lib)

1.1.5:
* Fix Totem not finding the type of a disc when it's not in /etc/fstab
* Some (more) volume button fixes
* Don't leak memory when getting the supported mime-types of the plugin
* Fix generation of the playlist-end signal in the playlist parser
* Allow reading DVD off the disk (GStreamer)

1.1.4:
* Fix sensitivity of the volume menu items
* Avoid crashes with the screensaver disabling code
* Use D-Bus for the communication between the mozilla plugin and the viewer
  (more reliable, and supports multiple plugins at the same time)
* Make it impossible to have the sidebar smaller than the buttons it contains
* Hide the sidebar when hiding the controls
* Make the sidebar shortcut F9 like other GNOME applications
* Add suport for ASF redirect files
* Don't display the length in full-screen mode if it is unknown
* Disable the "Save" button in the playlist if it is empty
* More volume button fixes
* Fix build with newer pkg-config versions
* Fix double error messages when reading encrypted files (xine-lib)
* Only create visual effects plugins when needed, not on startup (xine-lib)
* Allow remote subtitle files (GStreamer)

1.1.3:
* Move the playlist dialog to a sidebar
* Use a new volume widget in the main player window
* Deprecate the use of vcd:, dvd: and cd: to play discs, and have the
  user pass a directory (for vcd: and dvd:) or a device path (for all) instead
* Avoid resizing on startup before we really show the window
* Fix a crash when 'Hide controls' is called while starting up
* Move the Repeat and Shuffle menu items to the Edit menu
* Disable the Zoom menu items correctly on boundaries
* Don't crash when trying to set the Zoom level during startup
* Hide the main window quicker on exit
* Make the album name selectable in the property dialogues
* Update the length in the property window as the stream is played
* Add the ability to write/read a title when saving a playlist
* Ignore images and text files when reading playlists or parsing directories
* Say that we support Shorten and 3GPP files
* Show the track number in the window title if available
* Avoid triggering the mouse pointer highlighter when in fullscreen
* More resilient "Play disc" feature when trying to play back Audio CDs
* Sort files before inserting them in the playlist when dropping them
* Better parsing of ASX playlists and ASF reference files

* Better Mozilla plugin headers detection
* Fix compilation of the Mozilla plugin with GCC4
* Add a working volume button

* Fix the Mozilla plugin's window showing up outside the browser (GStreamer)
* Better iradio title support (GStreamer)
* Add DVD subtitles support (GStreamer)
* Better error messages on startup and during playback (GStreamer)
* Fix some memory leaks (GStreamer)
* Remove a few startup warnings (GStreamer)

* Work-around problem in xine-lib that could mean files showing up as 0-length
* Work-around errors when seeking near the end of an ASF/WMV file
* Fix crashes when playing back some files with errors (xine-lib)
* Add a proper warning when trying to play an empty file (xine-lib)
* Fix hand icon not appearing on DVD menus in fullscreen (xine-lib)
* Fix detection of still images with newer xine-lib
* Fix screenshot aspect ratio for some MPEG files

1.1.2:
* Use MusicBrainz to get Title, Album, etc. for audio CDs
* Also read 3 letters country-codes for subtitles and languages
* Remove unexisting local files from the recent files list
* Make subtitles and languages menus unsensitive rather than their submenus
* Have the nautilus properties page set the tab label according to the file type
* Add the "--print-playing" command-line option that does what it says
* Desensitise zoom menu items when boundaries are reached
* Allow building the Mozilla plugin with Firefox
* Avoid deadlocks/CPU burn with the thumbnailer
* Fix GTK+ only build, remove GNOME dependency on the thumbnailer
* Make the Exit fullscreen appear on the right screen for Xinerama setups
* Misc Mozilla and playlist fixes
* Fix some playlist files from winamp.com not being parsed properly
* Don't show the fullscreen popups when the video window isn't focused
* Fix crash with some recent files
* Allow to pass a device directly to the playlist, for DVD and VCD

* Better error messages for some types of input (xine-lib)
* Fix crashes when zooming out too far (xine-lib)

* Prevent window flickering with some files (GStreamer)
* Implement per-track CD playback (GStreamer)
* Improve metadata loading in the nautilus properties page (GStreamer)
* Implement aspect-ratio switching (GStreamer)
* Add subtitles/languages labels for audio streams (GStreamer)

1.1.1:
* Major enhancements to the experimental mozilla plugin
* Remove use of libnautilus-burn, and list all the CD drives in the main
  movie menu
* Add a preference to select the subtitle font
* Avoid the progress bar changing the status bar's height
* Allow Totem to be passed multiple files by Nautilus
* Translate the language names in Totem's menus
* Make the "Skip to..." dialog appear again
* Don't crash if the playlist contains non-UTF8 data
* Fix parsing of some ASX playlists
* Slight performance increase in adding entries to the playlist
* Fix Drag'n'drop of files and directories with broken UTF-8, and from
  Konqueror
* Close the 'Open Location' dialogue when 'Esc' is pressed
* Fix a crash when reaching the first element in a shuffled/repeat playlist
* Fix parsing of directories with special characters and broken UTF-8
* Use the new 'Leave fullscreen' icon and label
* Add the Video bitrate in the properties
* Prevent a click in the recent files really opening the first file twice
* Add --play and --pause command-line options
* Fix compilation with glibc 2.2 systems
* Add a man page for totem-video-thumbnailer, and update the totem one
* Fix possible crash in the BaconMessageConnection
* Require glib 2.6.3 to fix the thumbnailer exiting too soon
* Fix date shown from some OGG files (GStreamer)
* Fix the cursor not disappearing (GStreamer)
* Allow relative paths to be passed to the thumbnailer (GStreamer)
* More HIG fixes

5 files changed, 50 insertions, 23 deletions

diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 60664836cd8..f30c562bbd3 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2005/08/21 11:34:03 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/10/16 12:14:13 jmmv Exp $
 #
 
-DISTNAME=	totem-1.0.4
+DISTNAME=	totem-1.2.0
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.2/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.hadess.net/totem.php3
@@ -27,17 +27,29 @@ GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
 
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.totem
+.include "../../www/mozilla/gecko-options.mk"
+.include "../../mk/bsd.options.mk"
+
+BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
+BUILDLINK_DEPENDS.gstreamer+=		gstreamer>=0.8.4.1
+BUILDLINK_DEPENDS.gst-plugins+=		gstreamer>=0.8.4.1
+
+.include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../www/mozilla/gecko-depends.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 60ae37ed28b..2fc4c748524 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/21 11:34:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/10/16 12:14:13 jmmv Exp $
 bin/totem
 bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
@@ -43,6 +43,16 @@ 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/fr/figures/totem_next_button.png
+share/gnome/help/totem/fr/figures/totem_pause_button.png
+share/gnome/help/totem/fr/figures/totem_play_button.png
+share/gnome/help/totem/fr/figures/totem_previous_button.png
+share/gnome/help/totem/fr/figures/totem_show_playlist_button.png
+share/gnome/help/totem/fr/figures/totem_start_window.png
+share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
+share/gnome/help/totem/fr/legal.xml
+share/gnome/help/totem/fr/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
@@ -64,6 +74,7 @@ ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/totem.mo
@@ -84,6 +95,7 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/totem.mo
@@ -98,8 +110,10 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/totem.mo
@@ -109,6 +123,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/totem.mo
 share/omf/totem/totem-C.omf
 share/omf/totem/totem-de.omf
 share/omf/totem/totem-es.omf
+share/omf/totem/totem-fr.omf
 share/omf/totem/totem-ru.omf
 share/pixmaps/media-player-48.png
 share/pixmaps/vanity.png
@@ -117,8 +132,6 @@ share/totem/filmholes-big-right.png
 share/totem/filmholes.png
 share/totem/media-player-48.png
 share/totem/mozilla-viewer.glade
-share/totem/playlist-16.png
-share/totem/playlist-24.png
 share/totem/playlist-playing.png
 share/totem/playlist.glade
 share/totem/popup.glade
@@ -143,6 +156,8 @@ share/totem/vanity.png
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/totem/ru/figures
 @dirrm share/gnome/help/totem/ru
+@dirrm share/gnome/help/totem/fr/figures
+@dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/es/figures
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/de/figures
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 03efff610f8..91fdbd52135 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/08/21 11:34:03 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2005/10/16 12:14:13 jmmv Exp $
 
-SHA1 (totem-1.0.4.tar.gz) = fd660845e17a2b3df9173d84f0d06a31d1a06f4e
-RMD160 (totem-1.0.4.tar.gz) = 4b208b5cf3edf3aff9524f4c79b86f063f564726
-Size (totem-1.0.4.tar.gz) = 1974494 bytes
-SHA1 (patch-aa) = c71556c9ef50f191d74f9e33a1a9004acf8a79a1
-SHA1 (patch-ab) = 87349c909d689885070fd3d669cfef78898be24a
+SHA1 (totem-1.2.0.tar.gz) = b5bec35f48f411f0ff2088991eb8dccecf4d8017
+RMD160 (totem-1.2.0.tar.gz) = 5883997379f553be135303df4f2c9fc8c737990b
+Size (totem-1.2.0.tar.gz) = 2440616 bytes
+SHA1 (patch-aa) = bc3190e61faf561b6a009b8e0c2046f4937ade24
+SHA1 (patch-ab) = c2eafbc95048b51c1aa0750755755f54dad9c28b
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
index 5a5182a6972..c80a44df8dd 100644
--- a/multimedia/totem/patches/patch-aa
+++ b/multimedia/totem/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/05/02 16:21:21 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/16 12:14:13 jmmv Exp $
 
---- src/totem-disc.c.orig	2005-03-13 14:37:57.000000000 +0100
-+++ src/totem-disc.c
+--- src/plparse/totem-disc.c.orig	2005-03-13 14:37:57.000000000 +0100
++++ src/plparse/totem-disc.c
 @@ -34,7 +34,6 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/multimedia/totem/patches/patch-ab b/multimedia/totem/patches/patch-ab
index 2293e04b085..cd040e12e00 100644
--- a/multimedia/totem/patches/patch-ab
+++ b/multimedia/totem/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/16 12:14:13 jmmv Exp $
 
---- src/Makefile.in.orig	2005-03-07 18:01:00.000000000 +0100
+--- src/Makefile.in.orig	2005-09-05 12:12:20.000000000 +0200
 +++ src/Makefile.in
-@@ -686,7 +686,8 @@ clean-noinstLTLIBRARIES:
+@@ -645,7 +645,8 @@ clean-noinstLTLIBRARIES:
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
 -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 +install-pluginLTLIBRARIES:
-+dont-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
++do-not-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+ 	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
  	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \