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

2010-02-05 Thread Ionut Biru 
Date: Friday, February 5, 2010 @ 19:30:30
  Author: ibiru
Revision: 67286

Merged revisions 67284 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r67284 | ibiru | 2010-02-06 02:28:23 +0200 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: mplayer 30519-1
  bump to new revision


Modified:
  mplayer/repos/extra-x86_64/   (properties)
  mplayer/repos/extra-x86_64/PKGBUILD
Deleted:
  mplayer/repos/extra-x86_64/liba52_gcc_bug.patch

--+
 PKGBUILD |   11 ++-
 liba52_gcc_bug.patch |   10 --
 2 files changed, 6 insertions(+), 15 deletions(-)


Property changes on: mplayer/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-63432
   + /mplayer/trunk:1-67285

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-02-06 00:28:59 UTC (rev 67285)
+++ extra-x86_64/PKGBUILD   2010-02-06 00:30:30 UTC (rev 67286)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: Hugo Doria 
+# Maintainer : Ionut Biru 
+# Contributor: Hugo Doria 
 
 pkgname=mplayer
-pkgver=30325
-pkgrel=2
+pkgver=30519
+pkgrel=1
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'libxinerama'
  'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
  'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit' 'libcaca'
  'x264>=20100107' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 
'libjpeg>=8'
-'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
+'enca' 'libvdpau>=0.4' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/";
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
mplayer.desktop mplayer.png)
-md5sums=('f325e67b25b784f2e61983b32318aa9c'
+md5sums=('86c675752225118e2c156960378fc64b'
  'f91b1be03ed301cc15142f49455c1b88'
  'd00874ccc644b7f43d6ef1c942fcef28')
 

Deleted: extra-x86_64/liba52_gcc_bug.patch
===
--- extra-x86_64/liba52_gcc_bug.patch   2010-02-06 00:28:59 UTC (rev 67285)
+++ extra-x86_64/liba52_gcc_bug.patch   2010-02-06 00:30:30 UTC (rev 67286)
@@ -1,10 +0,0 @@
 mplayer/configure.old  2009-04-16 12:02:10.0 +0200
-+++ mplayer/configure  2009-05-22 15:23:38.0 +0200
-@@ -6410,6 +6410,7 @@
- def_liba52='#undef CONFIG_LIBA52'
- def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
- if test "$_liba52_internal" = yes ; then
-+  test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo 
$CFLAGS|sed "s/ *-O4 */ -O2 /")
-   _liba52=yes
-   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
-   _res_comment="internal"

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

2010-02-05 Thread Ionut Biru 
Date: Friday, February 5, 2010 @ 19:28:59
  Author: ibiru
Revision: 67285

Merged revisions 67284 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r67284 | ibiru | 2010-02-06 02:28:23 +0200 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: mplayer 30519-1
  bump to new revision


Modified:
  mplayer/repos/extra-i686/ (properties)
  mplayer/repos/extra-i686/PKGBUILD
Deleted:
  mplayer/repos/extra-i686/liba52_gcc_bug.patch

--+
 PKGBUILD |   11 ++-
 liba52_gcc_bug.patch |   10 --
 2 files changed, 6 insertions(+), 15 deletions(-)


Property changes on: mplayer/repos/extra-i686
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-63430
   + /mplayer/trunk:1-67284

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-02-06 00:28:23 UTC (rev 67284)
+++ extra-i686/PKGBUILD 2010-02-06 00:28:59 UTC (rev 67285)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: Hugo Doria 
+# Maintainer : Ionut Biru 
+# Contributor: Hugo Doria 
 
 pkgname=mplayer
-pkgver=30325
-pkgrel=2
+pkgver=30519
+pkgrel=1
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'libxinerama'
  'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
  'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit' 'libcaca'
  'x264>=20100107' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 
'libjpeg>=8'
-'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
+'enca' 'libvdpau>=0.4' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/";
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
mplayer.desktop mplayer.png)
-md5sums=('f325e67b25b784f2e61983b32318aa9c'
+md5sums=('86c675752225118e2c156960378fc64b'
  'f91b1be03ed301cc15142f49455c1b88'
  'd00874ccc644b7f43d6ef1c942fcef28')
 

Deleted: extra-i686/liba52_gcc_bug.patch
===
--- extra-i686/liba52_gcc_bug.patch 2010-02-06 00:28:23 UTC (rev 67284)
+++ extra-i686/liba52_gcc_bug.patch 2010-02-06 00:28:59 UTC (rev 67285)
@@ -1,10 +0,0 @@
 mplayer/configure.old  2009-04-16 12:02:10.0 +0200
-+++ mplayer/configure  2009-05-22 15:23:38.0 +0200
-@@ -6410,6 +6410,7 @@
- def_liba52='#undef CONFIG_LIBA52'
- def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
- if test "$_liba52_internal" = yes ; then
-+  test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo 
$CFLAGS|sed "s/ *-O4 */ -O2 /")
-   _liba52=yes
-   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
-   _res_comment="internal"

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

2010-01-16 Thread Ionut Biru 
Date: Saturday, January 16, 2010 @ 12:29:34
  Author: ibiru
Revision: 63227

Merged revisions 63225 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r63225 | ibiru | 2010-01-16 19:27:07 +0200 (Sat, 16 Jan 2010) | 2 lines
  
  upgpkg: mplayer 30325-1
  update to the latest revision to fix playing rmvb video files


Modified:
  mplayer/repos/extra-x86_64/   (properties)
  mplayer/repos/extra-x86_64/PKGBUILD
Deleted:
  mplayer/repos/extra-x86_64/fix_building.patch

+
 PKGBUILD   |   18 +-
 fix_building.patch |   14 --
 2 files changed, 5 insertions(+), 27 deletions(-)


Property changes on: mplayer/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-62804
   + /mplayer/trunk:1-63226

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-16 17:27:47 UTC (rev 63226)
+++ extra-x86_64/PKGBUILD   2010-01-16 17:29:34 UTC (rev 63227)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria 
 
 pkgname=mplayer
-pkgver=30286
+pkgver=30325
 pkgrel=1
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
 'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/";
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
liba52_gcc_bug.patch
-   mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
- 'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
  'f91b1be03ed301cc15142f49455c1b88'
- 'd00874ccc644b7f43d6ef1c942fcef28'
- '294c9c6af43c0453da7dd8de1a188f8a')
+ 'd00874ccc644b7f43d6ef1c942fcef28')
 
 build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS LDFLAGS
 
-  # Needed to compile using gcc 4.4.0
-#  patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1 
-
   cd ${srcdir}/${pkgname}
-  #bad revision
-  patch -p0 < ${srcdir}/fix_building.patch || return 1
 
   ./configure --prefix=/usr \
--enable-runtime-cpudetection \

Deleted: extra-x86_64/fix_building.patch
===
--- extra-x86_64/fix_building.patch 2010-01-16 17:27:47 UTC (rev 63226)
+++ extra-x86_64/fix_building.patch 2010-01-16 17:29:34 UTC (rev 63227)
@@ -1,14 +0,0 @@
 libavformat/network.h  (revision 21153)
-+++ libavformat/network.h  (working copy)
-@@ -23,6 +23,10 @@
- 
- #include "config.h"
- 
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include 
- #include 
-

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

2010-01-16 Thread Ionut Biru 
Date: Saturday, January 16, 2010 @ 12:27:47
  Author: ibiru
Revision: 63226

Merged revisions 63225 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r63225 | ibiru | 2010-01-16 19:27:07 +0200 (Sat, 16 Jan 2010) | 2 lines
  
  upgpkg: mplayer 30325-1
  update to the latest revision to fix playing rmvb video files


Modified:
  mplayer/repos/extra-i686/ (properties)
  mplayer/repos/extra-i686/PKGBUILD
Deleted:
  mplayer/repos/extra-i686/fix_building.patch

+
 PKGBUILD   |   18 +-
 fix_building.patch |   14 --
 2 files changed, 5 insertions(+), 27 deletions(-)


Property changes on: mplayer/repos/extra-i686
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-62803
   + /mplayer/trunk:1-63225

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/PKGBUILD 2010-01-16 17:27:47 UTC (rev 63226)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria 
 
 pkgname=mplayer
-pkgver=30286
+pkgver=30325
 pkgrel=1
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
 'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/";
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
liba52_gcc_bug.patch
-   mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
- 'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
  'f91b1be03ed301cc15142f49455c1b88'
- 'd00874ccc644b7f43d6ef1c942fcef28'
- '294c9c6af43c0453da7dd8de1a188f8a')
+ 'd00874ccc644b7f43d6ef1c942fcef28')
 
 build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS LDFLAGS
 
-  # Needed to compile using gcc 4.4.0
-#  patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1 
-
   cd ${srcdir}/${pkgname}
-  #bad revision
-  patch -p0 < ${srcdir}/fix_building.patch || return 1
 
   ./configure --prefix=/usr \
--enable-runtime-cpudetection \

Deleted: extra-i686/fix_building.patch
===
--- extra-i686/fix_building.patch   2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/fix_building.patch   2010-01-16 17:27:47 UTC (rev 63226)
@@ -1,14 +0,0 @@
 libavformat/network.h  (revision 21153)
-+++ libavformat/network.h  (working copy)
-@@ -23,6 +23,10 @@
- 
- #include "config.h"
- 
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include 
- #include 
-

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

2010-01-12 Thread Ionut Biru 
Date: Tuesday, January 12, 2010 @ 08:31:02
  Author: ibiru
Revision: 62805

Merged revisions 62803 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r62803 | ibiru | 2010-01-12 15:29:14 +0200 (Tue, 12 Jan 2010) | 1 line
  
  commit missing sources


Added:
  mplayer/repos/testing-x86_64/mplayer.desktop
(from rev 62803, mplayer/trunk/mplayer.desktop)
  mplayer/repos/testing-x86_64/mplayer.png
(from rev 62803, mplayer/trunk/mplayer.png)
Modified:
  mplayer/repos/testing-x86_64/ (properties)

-+
 mplayer.desktop |   19 +++
 1 file changed, 19 insertions(+)


Property changes on: mplayer/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-62798
   + /mplayer/trunk:1-62804

Copied: mplayer/repos/testing-x86_64/mplayer.desktop (from rev 62803, 
mplayer/trunk/mplayer.desktop)
===
--- testing-x86_64/mplayer.desktop  (rev 0)
+++ testing-x86_64/mplayer.desktop  2010-01-12 13:31:02 UTC (rev 62805)
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+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;

Copied: mplayer/repos/testing-x86_64/mplayer.png (from rev 62803, 
mplayer/trunk/mplayer.png)
===
(Binary files differ)

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

2010-01-12 Thread Ionut Biru 
Date: Tuesday, January 12, 2010 @ 08:30:19
  Author: ibiru
Revision: 62804

Merged revisions 62803 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk


  r62803 | ibiru | 2010-01-12 15:29:14 +0200 (Tue, 12 Jan 2010) | 1 line
  
  commit missing sources


Added:
  mplayer/repos/testing-i686/mplayer.desktop
(from rev 62803, mplayer/trunk/mplayer.desktop)
  mplayer/repos/testing-i686/mplayer.png
(from rev 62803, mplayer/trunk/mplayer.png)
Modified:
  mplayer/repos/testing-i686/   (properties)

-+
 mplayer.desktop |   19 +++
 1 file changed, 19 insertions(+)


Property changes on: mplayer/repos/testing-i686
___
Modified: svnmerge-integrated
   - /mplayer/trunk:1-62795
   + /mplayer/trunk:1-62803

Copied: mplayer/repos/testing-i686/mplayer.desktop (from rev 62803, 
mplayer/trunk/mplayer.desktop)
===
--- testing-i686/mplayer.desktop(rev 0)
+++ testing-i686/mplayer.desktop2010-01-12 13:30:19 UTC (rev 62804)
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+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;

Copied: mplayer/repos/testing-i686/mplayer.png (from rev 62803, 
mplayer/trunk/mplayer.png)
===
(Binary files differ)