[Lunar-commits] <moonbase> MPlayer: a little tidy up

[Dennis 'stumbles' Veatch]

commit a24ceaadc08603dc7097e084d7272fe13664098a
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Mar 13 16:34:50 2009 -0400

    MPlayer: a little tidy up
---
 video/MPlayer/DEPENDS |    3 ---
 video/MPlayer/DETAILS |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/video/MPlayer/DEPENDS b/video/MPlayer/DEPENDS
index 8b83c24..42b03be 100644
--- a/video/MPlayer/DEPENDS
+++ b/video/MPlayer/DEPENDS
@@ -19,10 +19,7 @@ optional_depends libggi      "--enable-ggi"    "--disable-ggi"       "General Gr
 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 ea19724..737e824 100644
--- a/video/MPlayer/DETAILS
+++ b/video/MPlayer/DETAILS
@@ -6,16 +6,12 @@
          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/