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

Perforce Review Daemon p4review at smee.org
Fri May 19 10:50:01 EDT 2006


Change 79519 by arwed_von_merkatz at arwed-Otherland on 2006/05/19 15:47:14

	fixed to work with sdl 1.2.10

Affected files ...

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

Differences ...

==== //sgl/grimoires/devel/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/devel/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/devel/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/devel/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/devel/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/devel/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
 



More information about the SM-Commit mailing list