Modified: test/video/mplayer/BUILD
==============================================================================
--- test/video/mplayer/BUILD (original)
+++ test/video/mplayer/BUILD Mon Jun 12 04:24:06 2006
@@ -1,17 +1,7 @@
-# needed so it actually uses gcc 3.4
-OPTS="$OPTS --cc=gcc" &&
-
-if [[ $MPLAYER_SVN = n ]]; then
- OPTS="$OPTS --enable-libavcodec"
-else
+if [[ $MPLAYER_SVN = y ]]; then
OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
fi &&
-# remove --enable-old-gtk for 1.0pre7try2 as it doesn't know that option
-if [[ $MPLAYER_GUI = gtk+ && $MPLAYER_SVN = n ]]; then
- OPTS="${OPTS/--enable-old-gtk/}"
-fi &&
-
OPTS="$MPLAYER_OPTS $OPTS" &&
Modified: test/video/mplayer/HISTORY
==============================================================================
--- test/video/mplayer/HISTORY (original)
+++ test/video/mplayer/HISTORY Mon Jun 12 04:24:06 2006
@@ -1,5 +1,14 @@
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0pre8, don't use gcc 3.4 for that anymore
+ * DEPENDS: removed gcc34, moved libmpcdec and twolame optional_depends
+ from svn version only to normal
+ * BUILD: removed gcc34 and mplayer 1.0pre7 workarounds
+ * CONFIGURE: gui choice for 1.0pre8 includes gtk+2
* DOWNLOAD: fixed so it actually works with non-svn version
+ * PRE_BUILD: removed all patching and sediting except the
+ cvs.Makefile.patch, renamed that to Makefile.patch
+ * cvs.Makefile.patch, mplayer-headers.patch, patch-CVS-2006-1502:
+ removed
2006-06-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, patch-CVS-2006-1502: security patch for bug #10883
Added: test/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig
==============================================================================
Binary file. No diff available.
Modified: test/video/mplayer/Makefile.patch
==============================================================================
--- test/video/mplayer/Makefile.patch (original)
+++ test/video/mplayer/Makefile.patch Mon Jun 12 04:24:06 2006
@@ -1,14 +1,14 @@
---- Makefile~ 2003-10-05 00:00:01.000000000 +0200
-+++ Makefile 2003-11-30 18:03:02.000000000 +0100
-@@ -284,11 +284,6 @@
+--- Makefile~ 2006-06-11 20:35:47.000000000 +0200
++++ Makefile 2006-06-12 09:31:16.000000000 +0200
+@@ -471,11 +471,6 @@
done
endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+ @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
+- echo "*** Download font at http://www.mplayerhq.hu/dload.html" ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
- fi
ifeq ($(GUI),yes)
- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
- @echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
+ @$(INSTALL) -d $(DATADIR)/skins
+ @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
Modified: test/video/mplayer/PRE_BUILD
==============================================================================
--- test/video/mplayer/PRE_BUILD (original)
+++ test/video/mplayer/PRE_BUILD Mon Jun 12 04:24:06 2006
@@ -1,21 +1,3 @@
default_pre_build &&
-invoke_gcc &&
cd $SOURCE_DIRECTORY &&
-if [[ $MPLAYER_SVN = y ]]; then
- patch Makefile $SCRIPT_DIRECTORY/cvs.Makefile.patch &&
- if [ "$MPLAYER_GUI" == "gtk+" ]; then
- sedit "s|_gui=no|_gui=yes|" configure &&
- sedit "s|_gtk1=no|_gtk1=yes|" configure
- elif [ "$MPLAYER_GUI" == "gtk+2" ]; then
- sedit "s|_gui=no|_gui=yes|" configure
- fi
-
-else
- # some incompatibility, probably with current glibc
- sedit 's/getline/vs_getline/' vobsub.c &&
- # patch for bug #10883
- patch -p0 < $SCRIPT_DIRECTORY/patch-CVE-2006-1502 &&
- # fixes bug #6833
- patch Makefile $SCRIPT_DIRECTORY/Makefile.patch &&
- patch -p1 < $SCRIPT_DIRECTORY/mplayer-headers.patch
-fi
+patch Makefile $SCRIPT_DIRECTORY/Makefile.patch
Deleted: test/video/mplayer/cvs.Makefile.patch
==============================================================================
--- test/video/mplayer/cvs.Makefile.patch Mon Jun 12 04:24:06 2006
+++ (empty file)
@@ -1,14 +0,0 @@
---- Makefile~ 2006-03-30 18:56:17.000000000 +0200
-+++ Makefile 2006-03-30 20:53:15.000000000 +0200
-@@ -492,11 +492,6 @@
- done
- endif
- @$(INSTALL) -d $(DATADIR)
-- @$(INSTALL) -d $(DATADIR)/font
-- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at http://www.mplayerhq.hu/dload.html" ; \
-- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
-- fi
- ifeq ($(GUI),yes)
- @$(INSTALL) -d $(DATADIR)/skins
- @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"