Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5a3d125e6fa8123ff657e78e1be5882d379a36d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5a3d125e6fa8123ff657e78e1be5882d379a36d1)
  • Date: Wed, 21 Nov 2007 15:22:43 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/mplayer/HISTORY | 3 +++
video/mplayer/PRE_BUILD | 5 +++++
video/mplayer/libavformat-api.patch | 22 ++++++++++++++++++++++
video/vlc/HISTORY | 3 +++
video/vlc/PRE_BUILD | 3 +++
video/vlc/ffmpeg-api.patch | 14 ++++++++++++++
6 files changed, 50 insertions(+)

New commits:
commit 5a3d125e6fa8123ff657e78e1be5882d379a36d1
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mplayer: support latest ffmpeg-svn

commit 04c9d7df085ec6033993ce25e9d0f8aa67682609
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc: support latest ffmpeg-svn

diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 4dd6dfd..8df7591 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, libavformat-api.patch: fix to support latest ffmpeg-svn
+
2007-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed the MPLAYER_SVN check around the live dependency,
both versions use the new flags now, moved polypaudio
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
new file mode 100755
index 0000000..5582beb
--- /dev/null
+++ b/video/mplayer/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $MPLAYER_SVN == y ]]; then
+ patch -p0 < $SPELL_DIRECTORY/libavformat-api.patch
+fi
diff --git a/video/mplayer/libavformat-api.patch
b/video/mplayer/libavformat-api.patch
new file mode 100644
index 0000000..788cd1a
--- /dev/null
+++ b/video/mplayer/libavformat-api.patch
@@ -0,0 +1,22 @@
+Index: libmpdemux/muxer_lavf.c
+===================================================================
+--- libmpdemux/muxer_lavf.c (revision 25134)
++++ libmpdemux/muxer_lavf.c (working copy)
+@@ -317,7 +317,7 @@
+ av_freep(&(priv->oc->streams[i]));
+ }
+
+- url_fclose(&(priv->oc->pb));
++ url_fclose((priv->oc->pb));
+
+ av_free(priv->oc);
+ }
+@@ -400,7 +400,7 @@
+ goto fail;
+ }
+
+- ((URLContext*)(priv->oc->pb.opaque))->priv_data= muxer;
++ ((URLContext*)(priv->oc->pb->opaque))->priv_data= muxer;
+
+ muxer->priv = (void *) priv;
+ muxer->cont_new_stream = &lavf_new_stream;
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index bdc1ba6..f7529be 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, ffmpeg-api.patch: fix for latest ffmpeg-svn support
+
2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: install_rootifying paths, added iceweasel support

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 0f7b0e7..73f6f8d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -12,5 +12,8 @@ fi &&
# available
patch -p0 < $SCRIPT_DIRECTORY/old-faad2.patch &&

+# patch for ffmpeg-svn of 2007-11-21, also supports older versions
+patch -p0 < $SPELL_DIRECTORY/ffmpeg-api.patch &&
+
# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/ffmpeg-api.patch b/video/vlc/ffmpeg-api.patch
new file mode 100644
index 0000000..03037a6
--- /dev/null
+++ b/video/vlc/ffmpeg-api.patch
@@ -0,0 +1,14 @@
+--- modules/codec/ffmpeg/mux.c.orig 2007-11-21 21:47:16.000000000 +0100
++++ modules/codec/ffmpeg/mux.c 2007-11-21 21:49:41.000000000 +0100
+@@ -133,7 +133,11 @@
+ return VLC_EGENERIC;
+ }
+
++#if (LIBAVFORMAT_BUILD >= ((52<<16)+(0<<8)+0))
++ p_sys->oc->pb = &p_sys->io;
++#else
+ p_sys->oc->pb = p_sys->io;
++#endif
+ p_sys->oc->nb_streams = 0;
+
+ p_sys->b_write_header = VLC_TRUE;



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5a3d125e6fa8123ff657e78e1be5882d379a36d1), Arwed von Merkatz, 11/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page