sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79520 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79520 by Arwed von Merkatz for review
Date: Fri, 19 May 2006 15:50:01 +0100 (BST)

Change 79520 by arwed_von_merkatz@arwed-Otherland on 2006/05/19 15:47:56

fix to make it work with sdl 1.2.10

Affected files ...

... //sgl/grimoires/test/video/ffmpeg-cvs/BUILD#11 integrate
... //sgl/grimoires/test/video/ffmpeg-cvs/DEPENDS#5 integrate
... //sgl/grimoires/test/video/ffmpeg-cvs/HISTORY#19 integrate
... //sgl/grimoires/test/video/ffmpeg/BUILD#8 integrate
... //sgl/grimoires/test/video/ffmpeg/DEPENDS#3 integrate
... //sgl/grimoires/test/video/ffmpeg/HISTORY#11 integrate

Differences ...

==== //sgl/grimoires/test/video/ffmpeg-cvs/BUILD#11 (xtext) ====

@@ -9,4 +9,5 @@
--enable-pp \
--enable-gpl \
$OPTS &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
make

==== //sgl/grimoires/test/video/ffmpeg-cvs/DEPENDS#5 (xtext) ====

@@ -30,4 +30,8 @@
optional_depends "xvid" \
"--enable-xvid" \
"" \
- "for xvid support"
+ "for xvid support" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"

==== //sgl/grimoires/test/video/ffmpeg-cvs/HISTORY#19 (text) ====

@@ -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

==== //sgl/grimoires/test/video/ffmpeg/BUILD#8 (xtext) ====

@@ -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 &&

==== //sgl/grimoires/test/video/ffmpeg/DEPENDS#3 (xtext) ====

@@ -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"

==== //sgl/grimoires/test/video/ffmpeg/HISTORY#11 (text) ====

@@ -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] PERFORCE change 79520 by Arwed von Merkatz for review, Perforce Review Daemon, 05/19/2006