[Lunar-commits] <moonbase> Revert "MPlayer: bumping to checkout-2009-03-11. It is PSAFE, adding a couple of"

[Dennis 'stumbles' Veatch]

commit 1475be9b7904c30a76e0b13ff7172fce2c193cdf
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Mar 13 16:29:52 2009 -0400

    Revert "MPlayer: bumping to checkout-2009-03-11. It is PSAFE, adding a couple of"
    
    This reverts commit 33430b2be14ad04092c6a6579b132ff3581e4415.
    
    Conflicts:
    
    	video/MPlayer/DEPENDS
    	video/MPlayer/DETAILS
---
 video/MPlayer/BUILD   |    7 ++++++-
 video/MPlayer/DEPENDS |    6 ++++++
 video/MPlayer/DETAILS |   20 +++++++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/video/MPlayer/BUILD b/video/MPlayer/BUILD
index a614ddd..919b81b 100644
--- a/video/MPlayer/BUILD
+++ b/video/MPlayer/BUILD
@@ -1,7 +1,12 @@
 (
 
+patch_it $SOURCE7 0 &&
+patch_it $SOURCE8 0 &&
+patch_it $SOURCE9 0 &&
+patch_it $SOURCE10 0 &&
+
   # using CFLAGS other than MPlayers autodetected will break
-  unset CFLAGS
+  bad_flags compiler
 
   if [ $MENCODER == "n" ] ; then
     OPTS=$OPTS" --disable-mencoder"
diff --git a/video/MPlayer/DEPENDS b/video/MPlayer/DEPENDS
index 8b3c7c7..8b83c24 100644
--- a/video/MPlayer/DEPENDS
+++ b/video/MPlayer/DEPENDS
@@ -1,5 +1,6 @@
 depends freetype2
 depends unzip
+depends MPlayer-essentials
 
 optional_depends libdvdread  ""                "" "To read DVDs"
 optional_depends SDL         "--enable-sdl"    "" "to use SDL to output video signal"
@@ -13,10 +14,15 @@ optional_depends libXvMC     "--enable-xvmc --with-xvmclib=XvMCW" \
                              "" "for hardware XvMC acceleration"
 
 optional_depends gtk+-2      "--enable-gui"    "--disable-gui"       "for MPlayer GTK gui support"
+optional_depends MPlayer-all ""                ""                    "to install more foreign codecs"
 optional_depends libggi      "--enable-ggi"    "--disable-ggi"       "General Graphics Interface support"
 optional_depends libggiwmh   "--enable-ggiwmh" "--disable-ggiwmh"    "GGI extension support"
 optional_depends amrnb       ""                "--disable-libamr_nb" "AMR narrowband support"
 optional_depends amrwb       ""                "--disable-libamr_wb" "AMR wideband support"
+<<<<<<< HEAD:video/MPlayer/DEPENDS
 optional_depends mpeg2dec    ""                ""                    "for mpeg-1 and mpeg-2 support"
 optional_depends x264-snapshot  ""             ""                    "for H264/AVC video stream support"
 optional_depends  "live555"  ""                ""                    "for RTP/RTCP, RTSP, SIP support"
+=======
+optional_depends x264-snapshot  "--enable-x264"   "--disable-x264"      "for H264/AVC video stream support"
+>>>>>>> 33430b2... MPlayer: bumping to checkout-2009-03-11. It is PSAFE, adding a couple of:video/MPlayer/DEPENDS
diff --git a/video/MPlayer/DETAILS b/video/MPlayer/DETAILS
index 7f446f1..ea19724 100644
--- a/video/MPlayer/DETAILS
+++ b/video/MPlayer/DETAILS
@@ -1,13 +1,21 @@
           MODULE=MPlayer
-         VERSION=checkout-snapshot
-          SOURCE=mplayer-$VERSION.tar.bz2
+         VERSION=1.0rc2
+          SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=font-arial-iso-8859-1.tar.bz2
          SOURCE3=font-arial-iso-8859-2.tar.bz2
          SOURCE4=font-arial-cp1250.tar.bz2
          SOURCE5=font-arial-iso-8859-7.tar.bz2
          SOURCE6=Blue-1.7.tar.bz2
+<<<<<<< HEAD:video/MPlayer/DETAILS
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mplayer-checkout-2009-03-11
    SOURCE_URL[0]=$MIRROR_URL
+=======
+         SOURCE7=stream_cddb_fix_20080120.diff
+         SOURCE8=url_fix_20080120.diff
+         SOURCE9=demux_mov_fix_20080129.diff
+        SOURCE10=demux_audio_fix_20080129.diff
+   SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/
+>>>>>>> 33430b2... MPlayer: bumping to checkout-2009-03-11. It is PSAFE, adding a couple of:video/MPlayer/DETAILS
    SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/
   SOURCE2_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
   SOURCE2_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
@@ -18,6 +26,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mplayer-checkout-2009-03-11
   SOURCE5_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
   SOURCE5_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
   SOURCE6_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/skins/
+     SOURCE7_URL=http://www.mplayerhq.hu/MPlayer/patches/
+     SOURCE8_URL=http://www.mplayerhq.hu/MPlayer/patches/
+     SOURCE9_URL=http://www.mplayerhq.hu/MPlayer/patches/
+    SOURCE10_URL=http://www.mplayerhq.hu/MPlayer/patches/
+      SOURCE_VFY=sha1:e9b496f3527c552004ec6d01d6b43f196b43ce2d
      SOURCE2_VFY=sha1:152c40bf20de34aa8802d7f80d34d673b0b67212
      SOURCE3_VFY=sha1:7b99bbe0e9ba89a57eccbea8f93c453c4f268181
      SOURCE4_VFY=sha1:ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
@@ -29,7 +42,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mplayer-checkout-2009-03-11
     SOURCE10_VFY=sha1:e25ba7d8d696d9c6365f105134ba723404adb4e1
         WEB_SITE=http://www.mplayerhq.hu
          ENTERED=20010922
-         UPDATED=20090311
+         UPDATED=20080409
+           PSAFE=no
            SHORT="A movie and animation player"
 
 cat << EOF