Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK change 9195 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK change 9195 to grimoire.svk
  • Date: Mon, 12 Jun 2006 04:24:07 -0500

Group: defaults
Subject: r9195 - in test: . video/mplayer

Author: arwed
Date: Mon Jun 12 04:24:06 2006
New Revision: 9195

Added:
test/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig (contents, props changed)
Removed:
test/video/mplayer/cvs.Makefile.patch
test/video/mplayer/mplayer-headers.patch
test/video/mplayer/mplayer_20060519.tar.bz2.sig
test/video/mplayer/patch-CVE-2006-1502
Modified:
test/ (props changed)
test/video/mplayer/BUILD
test/video/mplayer/CONFIGURE
test/video/mplayer/DEPENDS
test/video/mplayer/DETAILS
test/video/mplayer/HISTORY
test/video/mplayer/Makefile.patch
test/video/mplayer/PRE_BUILD

Log:
r9246@Otherland: arwed | 1970-01-01 01:00:00 +0200
mplayer: updated release to 1.0pre8


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" &&

CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \

Modified: test/video/mplayer/CONFIGURE
==============================================================================
--- test/video/mplayer/CONFIGURE (original)
+++ test/video/mplayer/CONFIGURE Mon Jun 12 04:24:06 2006
@@ -1,8 +1,4 @@
-if [[ $MPLAYER_SVN = y ]]; then
- config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2
-else
- config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+
-fi &&
+config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2 &&
config_query_option MPLAYER_OPTS \
"Enable Joystick support?" ${MPLAYER_JOYSTICK:-y} \
"--enable-joystick" "--disable-joystick" &&

Modified: test/video/mplayer/DEPENDS
==============================================================================
--- test/video/mplayer/DEPENDS (original)
+++ test/video/mplayer/DEPENDS Mon Jun 12 04:24:06 2006
@@ -1,6 +1,3 @@
-if [[ $MPLAYER_SVN = n ]]; then
- depends gcc34
-fi &&
if [ "$MPLAYER_GUI" == "gtk+" ]
then depends gtk+ '--enable-gui --enable-old-gtk' &&
depends mplayer-gui
@@ -12,11 +9,11 @@
if [[ $MPLAYER_SVN = y ]]; then
depends subversion &&
optional_depends ffmpeg-svn \
- "--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one" &&
- optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support"
+ "--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one"
fi &&

# audio codecs
+optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
optional_depends libvorbis "--disable-internal-tremor" "" "to use external
libvorbis to play ogg/vorbis audio" &&
optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
optional_depends xmms "--enable-xmms" "" "for xmms input plugin support" &&
@@ -34,9 +31,7 @@
optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
optional_depends xanim-codecs "" "--disable-xanim" "for additional codecs
(intel indeo, ...)" "z-rejected" &&
optional_depends xvid "" "--disable-xvid" "for encoding with the xvid codec
(distribution in USA and Japan is forbidden)" &&
-if [[ $MPLAYER_SVN = y ]]; then
- optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder"
-fi &&
+optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder" &&

# audio devices
optional_depends svgalib "" "--disable-svga" "for svgalib video output" &&

Modified: test/video/mplayer/DETAILS
==============================================================================
--- test/video/mplayer/DETAILS (original)
+++ test/video/mplayer/DETAILS Mon Jun 12 04:24:06 2006
@@ -11,14 +11,13 @@
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0pre7try2
+ VERSION=1.0pre8
SOURCE=MPlayer-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
- SOURCE_HASH=sha1:dcaced128167f15d094c9b63ca8b3dfd8f583e32
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
- GCC_VERSION=3.4
SECURITY_PATCH=1
fi
WEB_SITE=http://www.mplayerhq.hu

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";

Deleted: test/video/mplayer/mplayer-headers.patch
==============================================================================
--- test/video/mplayer/mplayer-headers.patch Mon Jun 12 04:24:06 2006
+++ (empty file)
@@ -1,12 +0,0 @@
---- main/osdep/kerneltwosix.h.orig 2004-04-16 13:10:24.000000000 +0000
-+++ main/osdep/kerneltwosix.h 2004-04-16 13:10:36.000000000 +0000
-@@ -1,9 +1,3 @@
- #include <linux/version.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
--#define __KERNEL__
--#include <linux/thread_info.h>
--#include <linux/list.h>
--#undef __KERNEL__
--#endif
-
-

Deleted: test/video/mplayer/mplayer_20060519.tar.bz2.sig
==============================================================================
Binary file. No diff available.

Deleted: test/video/mplayer/patch-CVE-2006-1502
==============================================================================
--- test/video/mplayer/patch-CVE-2006-1502 Mon Jun 12 04:24:06 2006
+++ (empty file)
@@ -1,69 +0,0 @@
---- libmpdemux/aviheader.c.orig Tue Feb 22 17:24:18 2005
-+++ libmpdemux/aviheader.c Fri Apr 7 11:56:53 2006
-@@ -205,8 +205,10 @@
- break; }
- case mmioFOURCC('i', 'n', 'd', 'x'): {
- uint32_t i;
-- unsigned msize = 0;
- avisuperindex_chunk *s;
-+ if(chunksize<=24){
-+ break;
-+ }
- priv->suidx_size++;
- priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof
(avisuperindex_chunk));
- s = &priv->suidx[priv->suidx_size-1];
-@@ -224,11 +226,18 @@
-
- print_avisuperindex_chunk(s);
-
-- msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse;
-- s->aIndex = malloc(msize);
-- memset (s->aIndex, 0, msize);
-- s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk));
-- memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk));
-+ if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
-+ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
-+ s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
-+ }
-+
-+ // Check and fix this useless crap
-+ if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
-+ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size:
%u\n",s->wLongsPerEntry);
-+ s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
-+ }
-+ s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
-+ s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
-
- // now the real index of indices
- for (i=0; i<s->nEntriesInUse; i++) {
-@@ -636,6 +645,8 @@
- idx->dwChunkLength=len;
-
- c=stream_read_dword(demuxer->stream);
-+
-+ if(!len) idx->dwFlags&=~AVIIF_KEYFRAME;
-
- // Fix keyframes for DivX files:
- if(idxfix_divx)
---- libmpdemux/asfheader.c.orig Sat Dec 25 09:31:32 2004
-+++ libmpdemux/asfheader.c Fri Apr 7 11:55:29 2006
-@@ -189,7 +189,7 @@
- while ((pos = find_asf_guid(hdr, asf_stream_header_guid, pos, hdr_len))
>= 0)
- {
- ASF_stream_header_t *streamh = (ASF_stream_header_t *)&hdr[pos];
-- char *buffer;
-+ uint8_t *buffer;
- pos += sizeof(ASF_stream_header_t);
- if (pos > hdr_len) goto len_err_out;
- le2me_ASF_stream_header_t(streamh);
-@@ -222,7 +222,9 @@
- asf_scrambling_h=buffer[0];
- asf_scrambling_w=(buffer[2]<<8)|buffer[1];
- asf_scrambling_b=(buffer[4]<<8)|buffer[3];
-- asf_scrambling_w/=asf_scrambling_b;
-+ if(asf_scrambling_b>0){
-+ asf_scrambling_w/=asf_scrambling_b;
-+ }
- } else {
- asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
- }



  • [SM-Commit] SVK change 9195 to grimoire.svk, Arwed von Merkatz, 06/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page