Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ac2eb6c50578fbea637f3b21d657b197059afc30)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ac2eb6c50578fbea637f3b21d657b197059afc30)
  • Date: Wed, 2 Jun 2010 10:11:32 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null |binary
video/mplayer/DEPENDS | 6 ---
video/mplayer/DETAILS | 2 -
video/mplayer/HISTORY | 4 ++
video/mplayer/MPlayer-1.0rc2.tar.bz2.sig | 0
video/mplayer/MPlayer-1.0rc3.tar.bz2.sig |binary
video/mplayer/PRE_BUILD | 11 ------
video/mplayer/demux_audio_fix_20080129.diff | 11 ------
video/mplayer/demux_mov_fix_20080129.diff | 45
----------------------------
video/mplayer/mplayer_demux_real.patch | 28 -----------------
video/mplayer/stream_cddb_fix_20080120.diff | 32 -------------------
video/mplayer/url_fix_20080120.diff | 10 ------
12 files changed, 6 insertions(+), 143 deletions(-)

New commits:
commit ac2eb6c50578fbea637f3b21d657b197059afc30
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

mplayer 1.0rc3

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 7ec4d4c..b6fc72e 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -23,11 +23,7 @@ fi &&

optional_depends libvorbis "--disable-tremor-internal" "" "to use external
libvorbis to play ogg/vorbis audio" &&

-if [ "$MPLAYER_SVN" == "y" ]; then
- optional_depends faad2 "--enable-faad --disable-faad-internal" "" "to use
shared faad for AAC decoding"
-else
- optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
-fi &&
+optional_depends faad2 "--enable-faad --disable-faad-internal" "" "to use
shared faad for AAC decoding" &&

# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 3c68d31..0acb970 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -11,7 +11,7 @@ if [ "$MPLAYER_SVN" == "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0rc2
+ VERSION=1.0rc3
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
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index d76b0e8..9e7d3a3 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2010-06-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0rc3
+ * PRE_BUILD, *diff, *patch: patches removed
+
2010-01-14 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Building MPlayer with X11 support requires xorg-server
built
with DPMS (and some others I didn't spend time to figure out)
diff --git a/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig
deleted file mode 100644
index 94d9cab..0000000
Binary files a/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig and /dev/null differ
diff --git a/video/mplayer/MPlayer-1.0rc3.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc3.tar.bz2.sig
new file mode 100644
index 0000000..f61b75e
Binary files /dev/null and b/video/mplayer/MPlayer-1.0rc3.tar.bz2.sig differ
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
deleted file mode 100755
index 4a7ebed..0000000
--- a/video/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-if [[ ! $MPLAYER_SVN = y ]]; then
- cd $SOURCE_DIRECTORY &&
- for i in demux_audio_fix_20080129.diff \
- demux_mov_fix_20080129.diff \
- stream_cddb_fix_20080120.diff \
- url_fix_20080120.diff \
- mplayer_demux_real.patch; do
- patch -p0 < $SCRIPT_DIRECTORY/$i
- done
-fi
diff --git a/video/mplayer/demux_audio_fix_20080129.diff
b/video/mplayer/demux_audio_fix_20080129.diff
deleted file mode 100644
index 1b18b6e..0000000
--- a/video/mplayer/demux_audio_fix_20080129.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpdemux/demux_audio.c (revision 24724)
-+++ libmpdemux/demux_audio.c (working copy)
-@@ -229,6 +229,8 @@
- ptr += 4;
-
- comment = ptr;
-+ if (&comment[length] < comments || &comment[length] >=
&comments[blk_len])
-+ return;
- c = comment[length];
- comment[length] = 0;
-
diff --git a/video/mplayer/demux_mov_fix_20080129.diff
b/video/mplayer/demux_mov_fix_20080129.diff
deleted file mode 100644
index d83477b..0000000
--- a/video/mplayer/demux_mov_fix_20080129.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- libmpdemux/demux_mov.c (revision 24724)
-+++ libmpdemux/demux_mov.c (working copy)
-@@ -173,11 +173,12 @@
- i=trak->chunkmap_size;
- while(i>0){
- --i;
-- for(j=trak->chunkmap[i].first;j<last;j++){
-+ j=FFMAX(trak->chunkmap[i].first, 0);
-+ for(;j<last;j++){
- trak->chunks[j].desc=trak->chunkmap[i].sdid;
- trak->chunks[j].size=trak->chunkmap[i].spc;
- }
-- last=trak->chunkmap[i].first;
-+ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
- }
-
- #if 0
-@@ -235,6 +236,8 @@
- s=0;
- for(j=0;j<trak->durmap_size;j++){
- for(i=0;i<trak->durmap[j].num;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pts=pts;
- ++s;
- pts+=trak->durmap[j].dur;
-@@ -246,6 +249,8 @@
- for(j=0;j<trak->chunks_size;j++){
- off_t pos=trak->chunks[j].pos;
- for(i=0;i<trak->chunks[j].size;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pos=pos;
- mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X
size=%d\n",s,
- trak->samples[s].pts,
-@@ -1568,8 +1573,7 @@
- if( udta_len>udta_size)
- udta_len=udta_size;
- {
-- char dump[udta_len-4];
-- stream_read(demuxer->stream, (char *)&dump,
udta_len-4-4);
-+ stream_skip(demuxer->stream, udta_len-4-4);
- udta_size -= udta_len;
- }
- }
diff --git a/video/mplayer/mplayer_demux_real.patch
b/video/mplayer/mplayer_demux_real.patch
deleted file mode 100644
index 88566fe..0000000
--- a/video/mplayer/mplayer_demux_real.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: libmpdemux/demux_real.c
-===================================================================
---- libmpdemux/demux_real.c (revision 27605)
-+++ libmpdemux/demux_real.c (working copy)
-@@ -947,6 +947,7 @@
- // last fragment!
- if(dp_hdr->len!=vpkg_length-vpkg_offset)
- mp_msg(MSGT_DEMUX,MSGL_V,"warning!
assembled.len=%d frag.len=%d total.len=%d
\n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
-+ if (vpkg_offset > dp->len - sizeof(dp_hdr_t) -
dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
- stream_read(demuxer->stream, dp_data+dp_hdr->len,
vpkg_offset);
- if((dp_data[dp_hdr->len]&0x20) &&
(sh_video->format==0x30335652)) --dp_hdr->chunks; else
- dp_hdr->len+=vpkg_offset;
-@@ -970,6 +971,7 @@
- // non-last fragment:
- if(dp_hdr->len!=vpkg_offset)
- mp_msg(MSGT_DEMUX,MSGL_V,"warning!
assembled.len=%d offset=%d frag.len=%d total.len=%d
\n",dp->len,vpkg_offset,len,vpkg_length);
-+ if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len)
len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
- stream_read(demuxer->stream, dp_data+dp_hdr->len,
len);
- if((dp_data[dp_hdr->len]&0x20) &&
(sh_video->format==0x30335652)) --dp_hdr->chunks; else
- dp_hdr->len+=len;
-@@ -992,6 +994,7 @@
- extra[0]=1; extra[1]=0; // offset of the first chunk
- if(0x00==(vpkg_header&0xc0)){
- // first fragment:
-+ if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len -
sizeof(dp_hdr_t);
- dp_hdr->len=len;
- stream_read(demuxer->stream, dp_data, len);
- ds->asf_packet=dp;
diff --git a/video/mplayer/stream_cddb_fix_20080120.diff
b/video/mplayer/stream_cddb_fix_20080120.diff
deleted file mode 100644
index 45f7226..0000000
--- a/video/mplayer/stream_cddb_fix_20080120.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- stream/stream_cddb.c (revision 24724)
-+++ stream/stream_cddb.c (working copy)
-@@ -53,6 +53,7 @@
- #include "version.h"
- #include "stream.h"
- #include "network.h"
-+#include "libavutil/intreadwrite.h"
-
- #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
- #define DEFAULT_CACHE_DIR "/.cddb/"
-@@ -453,8 +454,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS,
MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return 0;
-@@ -490,8 +492,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS,
MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return cddb_request_titles(cddb_data);
diff --git a/video/mplayer/url_fix_20080120.diff
b/video/mplayer/url_fix_20080120.diff
deleted file mode 100644
index a073589..0000000
--- a/video/mplayer/url_fix_20080120.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- stream/url.c (revision 24724)
-+++ stream/url.c (working copy)
-@@ -328,6 +328,7 @@
- }
- }
-
-+ tmp = NULL;
- while(i < len) {
- // look for the next char that must be kept
- for (j=i;j<len;j++) {



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ac2eb6c50578fbea637f3b21d657b197059afc30), Ladislav Hagara, 06/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page