[arch-commits] Commit in mplayer/repos (3 files)

[Hugo Doria]

    Date: Friday, December 5, 2008 @ 13:30:31
  Author: hugo
Revision: 20560

Merged revisions 16910,20559 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mplayer/trunk

........
  r16910 | eric | 2008-10-23 17:17:00 -0300 (Thu, 23 Oct 2008) | 2 lines
  
  upgpkg: mplayer 1.0rc2-7
      removed obsolete and already provided libungif depends
........
  r20559 | hugo | 2008-12-05 15:30:10 -0300 (Fri, 05 Dec 2008) | 1 line
  
  upgpkg: mplayer 1.0rc2-8
........

Added:
  mplayer/repos/extra-i686/mplayer_desktop.patch
    (from rev 20559, mplayer/trunk/mplayer_desktop.patch)
Modified:
  mplayer/repos/extra-i686/	(properties)
  mplayer/repos/extra-i686/PKGBUILD

-----------------------+
 PKGBUILD              |   22 +++++++++++-----------
 mplayer_desktop.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)


Property changes on: mplayer/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mplayer/trunk:1-16884
   + /mplayer/trunk:1-20559

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-05 18:30:10 UTC (rev 20559)
+++ extra-i686/PKGBUILD	2008-12-05 18:30:31 UTC (rev 20560)
@@ -2,11 +2,11 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=mplayer
 pkgver=1.0rc2
-pkgrel=7
+pkgrel=8
 pkgdesc="A movie player for linux"
 arch=(i686 x86_64)
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
-         'sdl' 'lame' 'libtheora' 'xvidcore' 'libungif' 'zlib'
+         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
          'x264>=20080625' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi')
 license=('GPL')
@@ -19,14 +19,11 @@
         http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff
         http://www.mplayerhq.hu/MPlayer/patches/url_fix_20080120.diff
         http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff
-	ivtv_2.6.24.patch)
-md5sums=('7e27e535c2d267637df34898f1b91707'
-         'e4e2020d11b681aac898103b3ba723c4'
-         '320af7daa1b248ee8e8c15d34d7923e3'
-         'ce999929155f509a3e6bee41d9d613ed'
-         '6a2c124586e1e6c44ae4ca1b4be9b6e4'
-         'c7d1bcdd61fcceb7598d61fe2213c587'
-	 '1ef35068587f6b6dbc99342567895236')
+	ivtv_2.6.24.patch mplayer_desktop.patch)
+md5sums=('7e27e535c2d267637df34898f1b91707' 'e4e2020d11b681aac898103b3ba723c4'\
+         '320af7daa1b248ee8e8c15d34d7923e3' 'ce999929155f509a3e6bee41d9d613ed'\
+         '6a2c124586e1e6c44ae4ca1b4be9b6e4' 'c7d1bcdd61fcceb7598d61fe2213c587'\
+         '1ef35068587f6b6dbc99342567895236' '4c49195a4a1702f0cb321abdc3c07741')
 
 build() {
   cd ${srcdir}/MPlayer-${pkgver}
@@ -39,7 +36,10 @@
 
   # Workaround for changed ivtv interface since it went mainline in 2.6.24
   patch -p1 -i ../ivtv_2.6.24.patch || return 1
-  
+
+  # mplayer.desktop fix
+  patch -p1 -i ../mplayer_desktop.patch || return 1
+
   # Fix security issues
   for p in demux_audio_fix_20080129.diff demux_mov_fix_20080129.diff url_fix_20080120.diff stream_cddb_fix_20080120.diff; do
     patch -p0 -i ../${p}

Copied: mplayer/repos/extra-i686/mplayer_desktop.patch (from rev 20559, mplayer/trunk/mplayer_desktop.patch)
===================================================================
--- extra-i686/mplayer_desktop.patch	                        (rev 0)
+++ extra-i686/mplayer_desktop.patch	2008-12-05 18:30:31 UTC (rev 20560)
@@ -0,0 +1,11 @@
+--- MPlayer-1.0rc2.orig/etc/mplayer.desktop	2008-11-17 02:09:22.000000000 +0200
++++ MPlayer-1.0rc2/etc/mplayer.desktop	2008-11-17 02:09:33.000000000 +0200
+@@ -10,7 +10,7 @@
+ Comment[it]=Lettore multimediale
+ Icon=mplayer.xpm
+ TryExec=gmplayer
+-Exec=gmplayer %U
++Exec=gmplayer %F
+ Terminal=false
+ Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;