Merge remote-tracking branch 'trikolon/nginx' into next

[people/teissler/ipfire-2.x.git] / lfs / sdl

diff --git a/lfs/sdl b/lfs/sdl
index f821b7f42532133b397ee2e4fe76bf0ccb9618c3..5f5ecdcef48b455f4bda3203f316443b70a709a5 100644 (file)
--- a/lfs/sdl
+++ b/lfs/sdl
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sdl
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = ""
+DEPS       = "alsa"
 
 ###############################################################################
 # Top-level Rules
@@ -77,6 +77,8 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch
+       cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install