sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
- From: root <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] SVK Change 9122 to grimoire.svk
- Date: Fri, 2 Jun 2006 02:49:41 -0500
Group: defaults
Subject: r9122 - test/video/ffmpeg
Author: arwed
Date: Mon May 22 12:09:36 2006
New Revision: 9122
Modified:
test/video/ffmpeg/BUILD
test/video/ffmpeg/DEPENDS
test/video/ffmpeg/HISTORY
Log:
sync up from p4
Modified: test/video/ffmpeg/BUILD
==============================================================================
--- test/video/ffmpeg/BUILD (original)
+++ test/video/ffmpeg/BUILD Mon May 22 12:09:36 2006
@@ -16,6 +16,7 @@
--enable-gpl \
--enable-a52 \
$OPTS &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
cd libavcodec/libpostproc &&
make &&
cd $SOURCE_DIRECTORY &&
Modified: test/video/ffmpeg/DEPENDS
==============================================================================
--- test/video/ffmpeg/DEPENDS (original)
+++ test/video/ffmpeg/DEPENDS Mon May 22 12:09:36 2006
@@ -22,4 +22,8 @@
optional_depends "freetype2" \
"" \
"" \
- "for a text render plugin"
+ "for a text render plugin" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"
Modified: test/video/ffmpeg/HISTORY
==============================================================================
--- test/video/ffmpeg/HISTORY (original)
+++ test/video/ffmpeg/HISTORY Mon May 22 12:09:36 2006
@@ -1,3 +1,8 @@
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
* BUILD: replaced fPIC and DPIC removal code with disable_pic
-
[SM-Commit] SVK Change 9122 to grimoire.svk,
root, 06/02/2006
- Re: [SM-Commit] SVK Change 9122 to grimoire.svk, Jeremy Blosser, 06/02/2006
Archive powered by MHonArc 2.6.24.