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

Thu Jan 22 11:06:01 UTC 2009

Date: Thursday, January 22, 2009 @ 06:06:01
  Author: hugo
Revision: 24955

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

........
  r24954 | hugo | 2009-01-22 08:05:41 -0300 (Qui, 22 Jan 2009) | 2 lines
  
  upgpkg: mplayer 28347-1
      Switching to svn. Patchs removed. Fixing FS#12466 FS#12375 FS#12289
........

Modified:
  mplayer/repos/extra-i686/	(properties)
  mplayer/repos/extra-i686/PKGBUILD
  mplayer/repos/extra-i686/mplayer_desktop.patch
Deleted:
  mplayer/repos/extra-i686/ivtv_2.6.24.patch
  mplayer/repos/extra-i686/mplayer-libx264.patch

-----------------------+
 PKGBUILD              |   54 ++++++++++++++----------------------------------
 ivtv_2.6.24.patch     |   33 -----------------------------
 mplayer-libx264.patch |   36 --------------------------------
 mplayer_desktop.patch |   22 +++++++++----------
 4 files changed, 27 insertions(+), 118 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-01-22 11:05:41 UTC (rev 24954)
+++ extra-i686/PKGBUILD	2009-01-22 11:06:01 UTC (rev 24955)
@@ -1,69 +1,47 @@
 # $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
+
 pkgname=mplayer
-pkgver=1.0rc2
-pkgrel=10
+pkgver=28347
+pkgrel=1
 pkgdesc="A movie player for linux"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
-         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib'
+         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
          'x264>=20090108' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${pkgver}.tar.bz2
-        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2        
-        http://www.mplayerhq.hu/MPlayer/patches/demux_audio_fix_20080129.diff
-        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 mplayer_desktop.patch mplayer-libx264.patch)
-md5sums=('7e27e535c2d267637df34898f1b91707' 'e4e2020d11b681aac898103b3ba723c4'\
-         '320af7daa1b248ee8e8c15d34d7923e3' 'ce999929155f509a3e6bee41d9d613ed'\
-         '6a2c124586e1e6c44ae4ca1b4be9b6e4' 'c7d1bcdd61fcceb7598d61fe2213c587'\
-         '1ef35068587f6b6dbc99342567895236' '4c49195a4a1702f0cb321abdc3c07741'\
-         'aa30511c30af372205aef56498990010')
+source=(ftp://ftp.archlinux.org/other/mplayer/${pkgname}-${pkgver}.tar.bz2
+        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 mplayer_desktop.patch)
+md5sums=('41fb540025a51930d318e99728a19c66'
+         'e4e2020d11b681aac898103b3ba723c4'
+         'fe66b052e74d35aa115f78a49d9d5aed')
 
 build() {
-  cd ${srcdir}/MPlayer-${pkgver}
-
   # Custom CFLAGS break the mplayer build
   unset CFLAGS
 
-  # Add support for gnome screensaver
-  #patch -p1 -i ../MPlayer-1.0rc1-gnome-screensaver.patch || return 1
+  cd ${srcdir}/${pkgname}/etc
+  patch -p0 < ${srcdir}/mplayer_desktop.patch || return 1
 
-  # Workaround for changed ivtv interface since it went mainline in 2.6.24
-  patch -p1 -i ../ivtv_2.6.24.patch || return 1
+  cd ${srcdir}/${pkgname}
 
-  # 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}
-  done
-
-  # Fix build issue with x264>=20090108
-  patch -p1 < ../mplayer-libx264.patch || return 1
-
-  cd ${srcdir}/MPlayer-${pkgver}
-
   ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
       --enable-runtime-cpudetection --confdir=/etc/mplayer --disable-nas \
       --enable-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
       --disable-liblzo --disable-speex --disable-openal \
       --enable-fribidi --disable-libdv --disable-musepack \
       --language=all --disable-dvdnav --disable-esd --disable-mga \
-      --disable-libamr_nb \
+      --disable-libamr_nb --disable-lirc \
       --with-extraincdir=/usr/lib/live-media
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
   make || return 1
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install || return 1
   cp etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
   ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
   rm -rf ${pkgdir}/usr/share/mplayer/font

Deleted: extra-i686/ivtv_2.6.24.patch
===================================================================
--- extra-i686/ivtv_2.6.24.patch	2009-01-22 11:05:41 UTC (rev 24954)
+++ extra-i686/ivtv_2.6.24.patch	2009-01-22 11:06:01 UTC (rev 24955)
@@ -1,33 +0,0 @@
-Patch to account for linux-2.6.24.x including ivtv, but MPlayer won't
-build against it.  See this link for more information and the origin
-of the patch:
-http://archives.free.net.ph/message/20080201.201454.1047775e.en.html
-Thanks to Robby Workman for pointing me to this one.
-
-diff -Nur MPlayer-1.0rc2.orig/configure MPlayer-1.0rc2/configure
----  MPlayer-1.0rc2.orig/configure	2007-10-07 21:49:33.000000000 +0200
-+++  MPlayer-1.0rc2/configure	2008-03-10 10:27:29.000000000 +0100
-@@ -4920,7 +4920,7 @@
- echores "$_dxr3"
- 
- 
--echocheck "IVTV TV-Out"
-+echocheck "IVTV TV-Out (pre linux-2.6.24)"
- if test "$_ivtv" = auto ; then
-   cat > $TMPC << EOF
- #include <stdlib.h>
-@@ -4928,7 +4928,13 @@
- #include <linux/types.h>
- #include <linux/videodev2.h>
- #include <linux/ivtv.h>
--int main(void) { return 0; }
-+#include <sys/ioctl.h>
-+int main(void) { 
-+struct ivtv_cfg_stop_decode sd;
-+struct ivtv_cfg_start_decode sd1;
-+ioctl (0, IVTV_IOC_START_DECODE, &sd1);
-+ioctl (0, IVTV_IOC_STOP_DECODE, &sd);
-+return 0; }
- EOF
-   _ivtv=no
-   cc_check && _ivtv=yes

Deleted: extra-i686/mplayer-libx264.patch
===================================================================
--- extra-i686/mplayer-libx264.patch	2009-01-22 11:05:41 UTC (rev 24954)
+++ extra-i686/mplayer-libx264.patch	2009-01-22 11:06:01 UTC (rev 24955)
@@ -1,36 +0,0 @@
-diff -ur ffmpeg.orig/libavcodec/libx264.c ffmpeg/libavcodec/libx264.c
---- ffmpeg.orig/libavcodec/libx264.c	2008-03-25 16:34:49.000000000 -0700
-+++ ffmpeg/libavcodec/libx264.c	2008-10-07 22:01:13.293938864 -0700
-@@ -162,7 +162,11 @@
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
-+#if X264_BUILD > 62
-+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-+#else
-     x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+#endif
-     x4->params.i_bframe_bias = avctx->bframebias;
-     x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID);
-     avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames;
-@@ -225,8 +229,10 @@
-     x4->params.analyse.i_me_range = avctx->me_range;
-     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
- 
-+#if X264_BUILD < 65
-     x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
-     x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
-+#endif
-     x4->params.analyse.b_mixed_references =
-         (avctx->flags2 & CODEC_FLAG2_MIXED_REFS);
-     x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA);
-@@ -251,7 +257,9 @@
-     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
-     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
-     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
-+#if X264_BUILD < 61
-     x4->params.rc.psz_rc_eq = avctx->rc_eq;
-+#endif
- 
-     x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR);
-     x4->params.i_log_level = X264_LOG_DEBUG;

Modified: extra-i686/mplayer_desktop.patch
===================================================================
--- extra-i686/mplayer_desktop.patch	2009-01-22 11:05:41 UTC (rev 24954)
+++ extra-i686/mplayer_desktop.patch	2009-01-22 11:06:01 UTC (rev 24955)
@@ -1,11 +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;
+--- mplayer.desktop	2008-04-12 21:29:02.000000000 -0300
++++ mplayer.desktop-new	2009-01-21 23:02:11.000000000 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+ Encoding=UTF-8
+-Name=MPlayer
++Name=GMPlayer
+ GenericName=Multimedia player
+ Comment=Multimedia player
+ Comment[de]=Multimedia-Player


