Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (2b5917e0c01d8d361788ae04dda33ae6f1fabd95)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (2b5917e0c01d8d361788ae04dda33ae6f1fabd95)
  • Date: Sun, 19 Nov 2006 08:56:07 -0600

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

video/transcode/01_configure.dpatch | 69
++++++++++++++++++++++++++++++++++++
video/transcode/HISTORY | 5 ++
video/transcode/PRE_BUILD | 6 ++-
3 files changed, 78 insertions(+), 2 deletions(-)

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

transcode: fix configure script to work with current ffmpeg-svn, bug 13207

diff --git a/video/transcode/01_configure.dpatch
b/video/transcode/01_configure.dpatch
new file mode 100644
index 0000000..39c53e7
--- /dev/null
+++ b/video/transcode/01_configure.dpatch
@@ -0,0 +1,69 @@
+--- transcode-1.0.2.old/configure 2005-07-04 09:15:58.000000000 +0200
++++ transcode-1.0.2/configure 2005-11-28 19:51:10.000000000 +0100
+@@ -27663,7 +27663,7 @@
+ echo "$as_me:$LINENO: checking for pkgconfig support for libavcodec" >&5
+ echo $ECHO_N "checking for pkgconfig support for libavcodec... $ECHO_C" >&6
+ if test x"$PKG_CONFIG" != x"no" ; then
+- if $PKG_CONFIG FFMpeg --exists ; then
++ if $PKG_CONFIG libavcodec --exists ; then
+ pkg_config_libavcodec="yes"
+ fi
+ fi
+@@ -27731,7 +27731,7 @@
+ echo "${ECHO_T}user" >&6
+ else
+ if test x"$pkg_config_libavcodec" != x"no" ; then
+- libavcodec_ii="`$PKG_CONFIG FFMpeg --cflags`"
++ libavcodec_ii="`$PKG_CONFIG libavcodec --cflags`"
+ echo "$as_me:$LINENO: result: pkg-config" >&5
+ echo "${ECHO_T}pkg-config" >&6
+ else
+@@ -27941,7 +27941,7 @@
+ echo "${ECHO_T}user" >&6
+ else
+ if test x"$pkg_config_libavcodec" != x"no" ; then
+- libavcodec_ll="`$PKG_CONFIG FFMpeg --libs`"
++ libavcodec_ll="`$PKG_CONFIG libavcodec --libs`"
+ echo "$as_me:$LINENO: result: pkg-config" >&5
+ echo "${ECHO_T}pkg-config" >&6
+ else
+@@ -28107,7 +28107,11 @@
+ printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after
20040703");
+ return(1);
+ }
+- printf("VER=%s\n", FFMPEG_VERSION);
++ #if LIBAVCODEC_BUILD >= 3344640
++ printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
++ #else
++ printf("VER=%s\n", FFMPEG_VERSION);
++ #endif
+ printf("BUILD=%d\n", LIBAVCODEC_BUILD);
+ return(0);
+ }
+@@ -31135,7 +31139,7 @@
+ echo "$as_me:$LINENO: checking for pkgconfig support for libpostproc" >&5
+ echo $ECHO_N "checking for pkgconfig support for libpostproc... $ECHO_C" >&6
+ if test x"$PKG_CONFIG" != x"no" ; then
+- if $PKG_CONFIG FFmpeg --exists ; then
++ if $PKG_CONFIG libpostproc --exists ; then
+ pkg_config_libpostproc="yes"
+ fi
+ fi
+@@ -31203,7 +31207,7 @@
+ echo "${ECHO_T}user" >&6
+ else
+ if test x"$pkg_config_libpostproc" != x"no" ; then
+- libpostproc_ii="`$PKG_CONFIG FFmpeg --cflags`"
++ libpostproc_ii="`$PKG_CONFIG libpostproc --cflags`"
+ echo "$as_me:$LINENO: result: pkg-config" >&5
+ echo "${ECHO_T}pkg-config" >&6
+ else
+@@ -31413,7 +31417,7 @@
+ echo "${ECHO_T}user" >&6
+ else
+ if test x"$pkg_config_libpostproc" != x"no" ; then
+- libpostproc_ll="`$PKG_CONFIG FFmpeg --libs`"
++ libpostproc_ll="`$PKG_CONFIG libpostproc --libs`"
+ echo "$as_me:$LINENO: result: pkg-config" >&5
+ echo "${ECHO_T}pkg-config" >&6
+ else
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index e858d12..b5586b0 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,8 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, 01_configure.dpatch: fix configure script to work with
+ ffmpeg-svn, bug #13207
+ * PRE_BUILD: also fix configure script to work with lzo 2.0x
+
2006-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: changed download location to
download.sourcemage.org/mirror, as the official download locations
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index 17b6302..b07dea4 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch
+patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch &&
+patch -p1 < $SCRIPT_DIRECTORY/01_configure.dpatch &&
+sedit 's/-llzo/-llzo2/' configure



  • [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (2b5917e0c01d8d361788ae04dda33ae6f1fabd95), Arwed v. Merkatz, 11/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page