[arch-commits] Commit in totem/repos (4 files)

[Jan de Groot]

    Date: Sunday, July 20, 2008 @ 18:05:13
  Author: jgc
Revision: 5799

Merged revisions 4463-5798 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/totem/trunk

........
  r5789 | jgc | 2008-07-20 21:39:33 +0000 (Sun, 20 Jul 2008) | 2 lines
  
  upgpkg: totem 2.22.2-3
      Fix license, add upstrem patch to fix FLV thumbnailing
........
  r5795 | jgc | 2008-07-20 21:56:55 +0000 (Sun, 20 Jul 2008) | 2 lines
  
  upgpkg: totem 2.22.2-3
      Fix mozilla plugin backend
........
  r5797 | jgc | 2008-07-20 21:59:07 +0000 (Sun, 20 Jul 2008) | 2 lines
  
  Force mozilla (xulrunner) as plugin
........

Added:
  totem/repos/extra-i686/video-flv.patch
    (from rev 5797, totem/trunk/video-flv.patch)
Modified:
  totem/repos/extra-i686/	(properties)
  totem/repos/extra-i686/30_totem_xulrunner19.patch
  totem/repos/extra-i686/PKGBUILD

----------------------------+
 30_totem_xulrunner19.patch |    2 +-
 PKGBUILD                   |   35 +++++++++++++++++++++--------------
 video-flv.patch            |   10 ++++++++++
 3 files changed, 32 insertions(+), 15 deletions(-)


Property changes on: totem/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /totem/trunk:1-4462
   + /totem/trunk:1-5798

Modified: extra-i686/30_totem_xulrunner19.patch
===================================================================
--- extra-i686/30_totem_xulrunner19.patch	2008-07-20 22:00:56 UTC (rev 5798)
+++ extra-i686/30_totem_xulrunner19.patch	2008-07-20 22:05:13 UTC (rev 5799)
@@ -116,7 +116,7 @@
 -	MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
 +	dnl This only works on gecko 1.9 and 1.8
 +	if $PKG_CONFIG --exists libxul; then
-+		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`"
 +	else
 +		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
 +	fi

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-20 22:00:56 UTC (rev 5798)
+++ extra-i686/PKGBUILD	2008-07-20 22:05:13 UTC (rev 5799)
@@ -3,11 +3,11 @@
 
 pkgname=totem
 pkgver=2.22.2
-pkgrel=2
+pkgrel=3
 url="http://www.hadess.net/totem.php3"
 pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
 arch=(i686 x86_64)
-license=('GPL')
+license=('GPL2' 'custom')
 depends=('gstreamer0.10-good-plugins' 'totem-plparser>=2.22.3' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes>=2.0' 'libepc>=0.3.5' 'python>=2.5.2' 'startup-notification' 'libgnomeui>=2.22.1' 'python-gdata' 'gnome-vfs>=2.22.0-2')
 makedepends=('nautilus>=2.22.2' 'xulrunner>=1.9' 'pkgconfig' 'bluez-libs' 'lirc-utils' 'gnome-doc-utils>=0.12.2' 'gnome-control-center>=2.22.1' 'libtracker' 'gnome-common' 'intltool' 'pygtk')
 options=('!libtool' '!emptydirs')
@@ -15,12 +15,16 @@
 groups=('gnome-extra')
 install=totem.install
 source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.22/${pkgname}-${pkgver}.tar.bz2
-	30_totem_xulrunner19.patch)
-md5sums=('6062080e81b4859f87fee8a592b92489' '42e3246acb3163bab35fc12816a19419')
+	30_totem_xulrunner19.patch
+	video-flv.patch)
+md5sums=('6062080e81b4859f87fee8a592b92489'
+         'ce0b0bdd822ad404bdc24e2fce3e7e21'
+         '8c66edc0e4fd64612189e76f57c40873')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/30_totem_xulrunner19.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/30_totem_xulrunner19.patch || return 1
+  patch -Np1 -i ${srcdir}/video-flv.patch || return 1
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1
@@ -30,19 +34,22 @@
               --libexecdir=/usr/lib/totem \
               --localstatedir=/var --disable-static \
 	      --enable-python \
-	      --enable-nautilus \
+	      --enable-nautilus --with-gecko=mozilla \
 	      --enable-mozilla --with-dbus \
 	      --disable-scrollkeeper || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-       DESTDIR=${startdir}/pkg install || return 1
+       DESTDIR=${pkgdir} install || return 1
 
-  rm -f ${startdir}/pkg/usr/share/totem/vanity.*
-  rm -f ${startdir}/pkg/usr/share/pixmaps/vanity.png
+  rm -f ${pkgdir}/usr/share/totem/vanity.*
+  rm -f ${pkgdir}/usr/share/pixmaps/vanity.png
 
-  rm -rf ${startdir}/pkg/usr/lib/mozilla
+  rm -rf ${pkgdir}/usr/lib/mozilla
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${pkgdir}/usr/share/gconf/schemas
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }

Copied: totem/repos/extra-i686/video-flv.patch (from rev 5797, totem/trunk/video-flv.patch)
===================================================================
--- extra-i686/video-flv.patch	                        (rev 0)
+++ extra-i686/video-flv.patch	2008-07-20 22:05:13 UTC (rev 5799)
@@ -0,0 +1,10 @@
+--- trunk/data/mime-type-list.txt	2008/03/14 00:50:55	5298
++++ trunk/data/mime-type-list.txt	2008/05/26 13:11:33	5433
+@@ -79,6 +79,7 @@
+ video/x-flc
+ video/x-fli
+ video/x-flic
++video/x-flv
+ video/x-m4v
+ video/x-matroska
+ video/x-mpeg