Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (a23b3885def67e93bc0d9ef0cbc701fd682ae353)

Chronological Thread  
    < 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 (a23b3885def67e93bc0d9ef0cbc701fd682ae353)
  • Date: Wed, 2 Apr 2008 12:33:30 -0500
GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/vlc/DEPENDS | 4
video/vlc/HISTORY | 4
video/vlc/PRE_BUILD | 3
video/vlc/vlc-ffmpegfix.patch | 372
++++++++++++++++++++++++++++++++++++++++++
4 files changed, 382 insertions(+), 1 deletion(-)

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

vlc: fix for ffmpeg-svn and dts/dca

diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 8f78ef4..ce20d2e 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -100,7 +100,9 @@ optional_depends "flac" \
"--disable-flac" \
"for flac audio decoder" &&

-optional_depends "libdca" \
+# doesn't actually work with libdca
+#optional_depends "libdca" \
+optional_depends "libdts" \
"--enable-dts" \
"--disable-dts" \
"for DTS audio decoder" &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 1c4a71f..f49fefe 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2008-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, vlc-ffmpegfix.patch: patch for latest ffmpeg-svn support
+ * DEPENDS: changed libdca back to libdts as it doesn't work with dca
+
2008-04-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.6f, SECURITY_PATCH=5

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index b43756d..331aba2 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -7,6 +7,9 @@ elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey;
then
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
sedit 's:$(libdir)/mozilla:$(libdir)/xulrunner:' mozilla/Makefile.in
fi &&
+if test "$(get_spell_provider $SPELL LIBAVCODEC)" = ffmpeg-svn; then
+ patch -p1 < $SPELL_DIRECTORY/vlc-ffmpegfix.patch
+fi &&

# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/vlc-ffmpegfix.patch b/video/vlc/vlc-ffmpegfix.patch
new file mode 100644
index 0000000..1c75f9d
--- /dev/null
+++ b/video/vlc/vlc-ffmpegfix.patch
@@ -0,0 +1,372 @@
+diff -ur vlc-0.8.6e/configure vlc-0.8.6e-ffmpegfix/configure
+--- vlc-0.8.6e/configure 2008-02-24 20:07:09.000000000 +0100
++++ vlc-0.8.6e-ffmpegfix/configure 2008-04-01 20:00:19.000000000 +0200
+@@ -44443,7 +44443,7 @@
+ if test "${FFMPEG_CONFIG}" != "no"
+ then
+
+-for ac_header in ffmpeg/avcodec.h
++for ac_header in libavcodec/avcodec.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -44579,15 +44579,15 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file ffmpeg/avcodec.h."
>&5
+-echo "$as_me: error: Missing header file ffmpeg/avcodec.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libavcodec/avcodec.h." >&5
++echo "$as_me: error: Missing header file libavcodec/avcodec.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ done
+
+
+-for ac_header in ffmpeg/avformat.h
++for ac_header in libavformat/avformat.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -44727,7 +44727,7 @@
+ done
+
+
+-for ac_header in ffmpeg/avutil.h
++for ac_header in libavutil/avutil.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -44867,7 +44867,7 @@
+ done
+
+
+-for ac_header in postproc/postprocess.h
++for ac_header in libpostproc/postprocess.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -45003,8 +45003,8 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file
postproc/postprocess.h." >&5
+-echo "$as_me: error: Missing header file postproc/postprocess.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libpostproc/postprocess.h." >&5
++echo "$as_me: error: Missing header file libpostproc/postprocess.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -45099,7 +45099,7 @@
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
+
+-for ac_header in ffmpeg/avcodec.h
++for ac_header in libavcodec/avcodec.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -45235,15 +45235,15 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file ffmpeg/avcodec.h."
>&5
+-echo "$as_me: error: Missing header file ffmpeg/avcodec.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libavcodec/avcodec.h." >&5
++echo "$as_me: error: Missing header file libavcodec/avcodec.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ done
+
+
+-for ac_header in ffmpeg/avformat.h
++for ac_header in libavformat/avformat.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -45383,7 +45383,7 @@
+ done
+
+
+-for ac_header in ffmpeg/avutil.h
++for ac_header in libavutil/avutil.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -45523,7 +45523,7 @@
+ done
+
+
+-for ac_header in postproc/postprocess.h
++for ac_header in libpostproc/postprocess.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -45659,8 +45659,8 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file
postproc/postprocess.h." >&5
+-echo "$as_me: error: Missing header file postproc/postprocess.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libpostproc/postprocess.h." >&5
++echo "$as_me: error: Missing header file libpostproc/postprocess.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -45981,7 +45981,7 @@
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
+
+-for ac_header in ffmpeg/avcodec.h
++for ac_header in libavcodec/avcodec.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -46117,15 +46117,15 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file ffmpeg/avcodec.h."
>&5
+-echo "$as_me: error: Missing header file ffmpeg/avcodec.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libavcodec/avcodec.h." >&5
++echo "$as_me: error: Missing header file libavcodec/avcodec.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ done
+
+
+-for ac_header in ffmpeg/avformat.h
++for ac_header in libavformat/avformat.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -46265,7 +46265,7 @@
+ done
+
+
+-for ac_header in ffmpeg/avutil.h
++for ac_header in libavutil/avutil.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -46405,7 +46405,7 @@
+ done
+
+
+-for ac_header in postproc/postprocess.h
++for ac_header in libpostproc/postprocess.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -46541,8 +46541,8 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file
postproc/postprocess.h." >&5
+-echo "$as_me: error: Missing header file postproc/postprocess.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libpostproc/postprocess.h." >&5
++echo "$as_me: error: Missing header file libpostproc/postprocess.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -46864,7 +46864,7 @@
+ echo "${ECHO_T}yes" >&6; }
+
+
+-for ac_header in ffmpeg/avcodec.h
++for ac_header in libavcodec/avcodec.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -47000,15 +47000,15 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file ffmpeg/avcodec.h."
>&5
+-echo "$as_me: error: Missing header file ffmpeg/avcodec.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libavcodec/avcodec.h." >&5
++echo "$as_me: error: Missing header file libavcodec/avcodec.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ done
+
+
+-for ac_header in ffmpeg/avformat.h
++for ac_header in libavformat/avformat.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -47148,7 +47148,7 @@
+ done
+
+
+-for ac_header in ffmpeg/avutil.h
++for ac_header in libavutil/avutil.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -47288,7 +47288,7 @@
+ done
+
+
+-for ac_header in postproc/postprocess.h
++for ac_header in libpostproc/postprocess.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -47424,8 +47424,8 @@
+ _ACEOF
+
+ else
+- { { echo "$as_me:$LINENO: error: Missing header file
postproc/postprocess.h." >&5
+-echo "$as_me: error: Missing header file postproc/postprocess.h." >&2;}
++ { { echo "$as_me:$LINENO: error: Missing header file
libpostproc/postprocess.h." >&5
++echo "$as_me: error: Missing header file libpostproc/postprocess.h." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/audio.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/audio.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/audio.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/audio.c 2008-04-01
20:13:27.000000000 +0200
+@@ -30,9 +30,9 @@
+
+ /* ffmpeg header */
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/chroma.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/chroma.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/chroma.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/chroma.c 2008-04-01
20:13:27.000000000 +0200
+@@ -29,9 +29,9 @@
+
+ /* ffmpeg header */
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/demux.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/demux.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/demux.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/demux.c 2008-04-01
20:15:17.000000000 +0200
+@@ -35,7 +35,7 @@
+ #ifdef HAVE_FFMPEG_AVFORMAT_H
+ # include <ffmpeg/avformat.h>
+ #else
+-# include <avformat.h>
++# include <libavformat/avformat.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/encoder.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/encoder.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/encoder.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/encoder.c 2008-04-01
20:13:27.000000000 +0200
+@@ -37,9 +37,9 @@
+ /* ffmpeg header */
+ #define HAVE_MMX 1
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #if LIBAVCODEC_BUILD < 4704
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/ffmpeg.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/ffmpeg.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/ffmpeg.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/ffmpeg.c 2008-04-01
20:13:27.000000000 +0200
+@@ -31,9 +31,9 @@
+ /* ffmpeg header */
+ #define HAVE_MMX 1
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #if LIBAVCODEC_BUILD < 4680
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/mux.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/mux.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/mux.c 2007-12-29 16:25:53.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/mux.c 2008-04-01
20:15:45.000000000 +0200
+@@ -34,7 +34,7 @@
+ #ifdef HAVE_FFMPEG_AVFORMAT_H
+ # include <ffmpeg/avformat.h>
+ #else
+-# include <avformat.h>
++# include <libavformat/avformat.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/postprocess.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/postprocess.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/postprocess.c 2007-11-21
23:23:29.000000000 +0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/postprocess.c 2008-04-01
20:13:27.000000000 +0200
+@@ -28,9 +28,9 @@
+
+ /* ffmpeg header */
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/video.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/video.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/video.c 2007-11-21 23:23:29.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/video.c 2008-04-01
20:13:27.000000000 +0200
+@@ -31,9 +31,9 @@
+
+ /* ffmpeg header */
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/codec/ffmpeg/video_filter.c
vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/video_filter.c
+--- vlc-0.8.6e/modules/codec/ffmpeg/video_filter.c 2008-02-24
20:01:53.000000000 +0100
++++ vlc-0.8.6e-ffmpegfix/modules/codec/ffmpeg/video_filter.c 2008-04-01
20:13:27.000000000 +0200
+@@ -31,9 +31,9 @@
+
+ /* ffmpeg header */
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+-# include <ffmpeg/avcodec.h>
++# include <ffmpeg/libavcodec/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #include "ffmpeg.h"
+diff -ur vlc-0.8.6e/modules/stream_out/switcher.c
vlc-0.8.6e-ffmpegfix/modules/stream_out/switcher.c
+--- vlc-0.8.6e/modules/stream_out/switcher.c 2007-11-21 23:23:22.000000000
+0100
++++ vlc-0.8.6e-ffmpegfix/modules/stream_out/switcher.c 2008-04-02
19:17:25.000000000 +0200
+@@ -39,7 +39,7 @@
+ #ifdef HAVE_FFMPEG_AVCODEC_H
+ # include <ffmpeg/avcodec.h>
+ #else
+-# include <avcodec.h>
++# include <libavcodec/avcodec.h>
+ #endif
+
+ #ifdef HAVE_POSTPROC_POSTPROCESS_H


  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (a23b3885def67e93bc0d9ef0cbc701fd682ae353), Arwed von Merkatz, 04/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page