Update totem and totem-xine to 1.3.0. Update based on patch provided by

martti@.

New features:
  * New Ukrainian (uk) help files
  * Use filters in the Open file dialogues
  * Support turning off the screensaver when gnome-screensaver is used
  * Scroll to the current file in the playlist when starting to play it
  * Add ability to play back DVDs and VCDs from .iso and .bin/.cue files
  * Add a menu item for switching angles on DVDs
  * Don't add backup files to the playlist
  * Remove audio CD playback from the UI, as to avoid duplication with sound-
  juicer and Rhythmbox

Bug fixes:
  * Play file from the beginning when double-clicking on it in the playlist
  * Make CD drives with blank CDs in them unsensitive in the Play Disc menu
  * Avoid weird startes when using the "Toggle fullscreen mode" shortcut
  * Fix drag'n'drop on the playlist itself not working
  * Parse Shoucast playlists in .m3u files properly
  * Stop the currently playing song when loading a media, and playing this
  media fails
  * Set the play/pause buttons' tooltips according to the image
  * Fix possible crashes on startup when the widget creation functions cannot
  be found
  * Use N/A instead of '0' when the bitrate or the number of frames per second
  isn't available in the property window
  * Fix a possible crash on startup in the Mozilla plugin
  * Fix possible i18n problems with the Nautilus properties window and the
  Mozilla plugin
  * Fix compilation of the Mozilla plugin with newer versions of D-Bus
  * Fix a memory leak in the Mozilla plugin
  * Fix a crasher when running the Mozilla plugin in a debug build
  * Allow compiling the Mozilla plugin against xulrunner
  * Fix duplicate access key in the display preferences
  * Fix wrong accesskeys for the saturation and hue sliders
  * Show the video properties again when a stream has video
  * Move Totem's remote socket to TMPDIR
  * Remove libmusicbrainz dependency
  * Detect DVDs and VCDs properly on a pmount setup
  * Don't save Totem's thumbnail with an alpha component, for recent
  Nautilus changes
  * Remove keyboard shortcuts from the main video popup menu
  * Fix resizing of the sidebar
  * Fix problems parsing remote ASX files

GStreamer:
  * GStreamer 0.10 support
  * Fix an access to invalid memory when getting metadata from a file

xine-lib:
  * Avoid playback stopping when seeking forward in DVDs
  * Get the xine-lib version at run-time

7 files changed, 29 insertions, 26 deletions

diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
index 4fddb44ad3e..4438b1ea529 100644
--- a/multimedia/totem-xine/Makefile
+++ b/multimedia/totem-xine/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/12/31 12:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/12 16:57:50 jmmv Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-xine-/}
-PKGREVISION=	3
 
 COMMENT+=	(using Xine)
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 5e22de0c022..ee57d89a92f 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/12/31 12:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/12 16:57:49 jmmv Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT+=	(using GStreamer)
-PKGREVISION=	2
 
 CONFLICTS+=	totem-xine-[0-9]*
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index f30c562bbd3..472596df9ca 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2005/10/16 12:14:13 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.11 2006/01/12 16:57:49 jmmv Exp $
 #
 
-DISTNAME=	totem-1.2.0
+DISTNAME=	totem-1.3.0
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.3/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.hadess.net/totem.php3
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 2fc4c748524..13d83c4651a 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/16 12:14:13 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/01/12 16:57:49 jmmv Exp $
 bin/totem
 bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
@@ -57,6 +57,16 @@ 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/help/totem/uk/figures/totem_next_button.png
+share/gnome/help/totem/uk/figures/totem_pause_button.png
+share/gnome/help/totem/uk/figures/totem_play_button.png
+share/gnome/help/totem/uk/figures/totem_previous_button.png
+share/gnome/help/totem/uk/figures/totem_show_playlist_button.png
+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/legal.xml
+share/gnome/help/totem/uk/totem.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/totem.mo
@@ -125,6 +135,7 @@ 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/omf/totem/totem-uk.omf
 share/pixmaps/media-player-48.png
 share/pixmaps/vanity.png
 share/totem/filmholes-big-left.png
@@ -154,6 +165,8 @@ share/totem/vanity.png
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/totem
 @comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/totem/uk/figures
+@dirrm share/gnome/help/totem/uk
 @dirrm share/gnome/help/totem/ru/figures
 @dirrm share/gnome/help/totem/ru
 @dirrm share/gnome/help/totem/fr/figures
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 91fdbd52135..05e08b88aa9 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/10/16 12:14:13 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2006/01/12 16:57:49 jmmv Exp $
 
-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
+SHA1 (totem-1.3.0.tar.gz) = 5bc6fd3199aa67c2c0799a063178b1b2362683fc
+RMD160 (totem-1.3.0.tar.gz) = 039dc36c7974f6d22295ca5a1469706744eba4c5
+Size (totem-1.3.0.tar.gz) = 2010546 bytes
+SHA1 (patch-aa) = 1267125093c4e76fc61575b83890b9adacff9a0d
+SHA1 (patch-ab) = 6327cf86050bf2fbd9d6b37c338304ddeb08092c
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
index c80a44df8dd..269ff11376a 100644
--- a/multimedia/totem/patches/patch-aa
+++ b/multimedia/totem/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/10/16 12:14:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/12 16:57:49 jmmv Exp $
 
 --- 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>
- #include <errno.h>
--#include <mntent.h>
- #include <string.h>
- 
- #include <sys/ioctl.h>
-@@ -44,7 +43,31 @@
+@@ -43,7 +43,31 @@
  #include <glib/gi18n.h>
  #include <libgnomevfs/gnome-vfs.h>
  
diff --git a/multimedia/totem/patches/patch-ab b/multimedia/totem/patches/patch-ab
index cd040e12e00..28a50ea8432 100644
--- a/multimedia/totem/patches/patch-ab
+++ b/multimedia/totem/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/10/16 12:14:13 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2006/01/12 16:57:49 jmmv Exp $
 
 --- src/Makefile.in.orig	2005-09-05 12:12:20.000000000 +0200
 +++ src/Makefile.in
-@@ -645,7 +645,8 @@ clean-noinstLTLIBRARIES:
+@@ -652,7 +652,8 @@ clean-noinstLTLIBRARIES:
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done