From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 May 2017 08:52:08 +0000 (+0100)
Subject: SDL: Update to 1.2.15
X-Git-Tag: v2.19-core112~77
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0ff77cf478fcbd098eba4df40eacf09711415f8c

SDL: Update to 1.2.15

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/sdl b/config/rootfiles/packages/sdl
index fdf4cafd9d..5aefece3dc 100644
--- a/config/rootfiles/packages/sdl
+++ b/config/rootfiles/packages/sdl
@@ -6,14 +6,6 @@
 #usr/include/SDL/SDL_byteorder.h
 #usr/include/SDL/SDL_cdrom.h
 #usr/include/SDL/SDL_config.h
-#usr/include/SDL/SDL_config_amiga.h
-#usr/include/SDL/SDL_config_dreamcast.h
-#usr/include/SDL/SDL_config_macos.h
-#usr/include/SDL/SDL_config_macosx.h
-#usr/include/SDL/SDL_config_minimal.h
-#usr/include/SDL/SDL_config_os2.h
-#usr/include/SDL/SDL_config_win32.h
-#usr/include/SDL/SDL_copying.h
 #usr/include/SDL/SDL_cpuinfo.h
 #usr/include/SDL/SDL_endian.h
 #usr/include/SDL/SDL_error.h
@@ -41,184 +33,185 @@
 #usr/include/SDL/begin_code.h
 #usr/include/SDL/close_code.h
 usr/lib/libSDL-1.2.so.0
-usr/lib/libSDL-1.2.so.0.11.0
+usr/lib/libSDL-1.2.so.0.11.4
 #usr/lib/libSDL.a
 #usr/lib/libSDL.la
 usr/lib/libSDL.so
 #usr/lib/libSDLmain.a
+#usr/lib/libSDLmain.la
 #usr/lib/pkgconfig/sdl.pc
-#usr/man/man3/SDLKey.3
-#usr/man/man3/SDL_ActiveEvent.3
-#usr/man/man3/SDL_AddTimer.3
-#usr/man/man3/SDL_AudioCVT.3
-#usr/man/man3/SDL_AudioSpec.3
-#usr/man/man3/SDL_BlitSurface.3
-#usr/man/man3/SDL_BuildAudioCVT.3
-#usr/man/man3/SDL_CD.3
-#usr/man/man3/SDL_CDClose.3
-#usr/man/man3/SDL_CDEject.3
-#usr/man/man3/SDL_CDName.3
-#usr/man/man3/SDL_CDNumDrives.3
-#usr/man/man3/SDL_CDOpen.3
-#usr/man/man3/SDL_CDPause.3
-#usr/man/man3/SDL_CDPlay.3
-#usr/man/man3/SDL_CDPlayTracks.3
-#usr/man/man3/SDL_CDResume.3
-#usr/man/man3/SDL_CDStatus.3
-#usr/man/man3/SDL_CDStop.3
-#usr/man/man3/SDL_CDtrack.3
-#usr/man/man3/SDL_CloseAudio.3
-#usr/man/man3/SDL_Color.3
-#usr/man/man3/SDL_CondBroadcast.3
-#usr/man/man3/SDL_CondSignal.3
-#usr/man/man3/SDL_CondWait.3
-#usr/man/man3/SDL_CondWaitTimeout.3
-#usr/man/man3/SDL_ConvertAudio.3
-#usr/man/man3/SDL_ConvertSurface.3
-#usr/man/man3/SDL_CreateCond.3
-#usr/man/man3/SDL_CreateCursor.3
-#usr/man/man3/SDL_CreateMutex.3
-#usr/man/man3/SDL_CreateRGBSurface.3
-#usr/man/man3/SDL_CreateRGBSurfaceFrom.3
-#usr/man/man3/SDL_CreateSemaphore.3
-#usr/man/man3/SDL_CreateThread.3
-#usr/man/man3/SDL_CreateYUVOverlay.3
-#usr/man/man3/SDL_Delay.3
-#usr/man/man3/SDL_DestroyCond.3
-#usr/man/man3/SDL_DestroyMutex.3
-#usr/man/man3/SDL_DestroySemaphore.3
-#usr/man/man3/SDL_DisplayFormat.3
-#usr/man/man3/SDL_DisplayFormatAlpha.3
-#usr/man/man3/SDL_DisplayYUVOverlay.3
-#usr/man/man3/SDL_EnableKeyRepeat.3
-#usr/man/man3/SDL_EnableUNICODE.3
-#usr/man/man3/SDL_Event.3
-#usr/man/man3/SDL_EventState.3
-#usr/man/man3/SDL_ExposeEvent.3
-#usr/man/man3/SDL_FillRect.3
-#usr/man/man3/SDL_Flip.3
-#usr/man/man3/SDL_FreeCursor.3
-#usr/man/man3/SDL_FreeSurface.3
-#usr/man/man3/SDL_FreeWAV.3
-#usr/man/man3/SDL_FreeYUVOverlay.3
-#usr/man/man3/SDL_GL_GetAttribute.3
-#usr/man/man3/SDL_GL_GetProcAddress.3
-#usr/man/man3/SDL_GL_LoadLibrary.3
-#usr/man/man3/SDL_GL_SetAttribute.3
-#usr/man/man3/SDL_GL_SwapBuffers.3
-#usr/man/man3/SDL_GLattr.3
-#usr/man/man3/SDL_GetAppState.3
-#usr/man/man3/SDL_GetAudioStatus.3
-#usr/man/man3/SDL_GetClipRect.3
-#usr/man/man3/SDL_GetCursor.3
-#usr/man/man3/SDL_GetError.3
-#usr/man/man3/SDL_GetEventFilter.3
-#usr/man/man3/SDL_GetGamma.3
-#usr/man/man3/SDL_GetGammaRamp.3
-#usr/man/man3/SDL_GetKeyName.3
-#usr/man/man3/SDL_GetKeyState.3
-#usr/man/man3/SDL_GetModState.3
-#usr/man/man3/SDL_GetMouseState.3
-#usr/man/man3/SDL_GetRGB.3
-#usr/man/man3/SDL_GetRGBA.3
-#usr/man/man3/SDL_GetRelativeMouseState.3
-#usr/man/man3/SDL_GetThreadID.3
-#usr/man/man3/SDL_GetTicks.3
-#usr/man/man3/SDL_GetVideoInfo.3
-#usr/man/man3/SDL_GetVideoSurface.3
-#usr/man/man3/SDL_Init.3
-#usr/man/man3/SDL_InitSubSystem.3
-#usr/man/man3/SDL_JoyAxisEvent.3
-#usr/man/man3/SDL_JoyBallEvent.3
-#usr/man/man3/SDL_JoyButtonEvent.3
-#usr/man/man3/SDL_JoyHatEvent.3
-#usr/man/man3/SDL_JoystickClose.3
-#usr/man/man3/SDL_JoystickEventState.3
-#usr/man/man3/SDL_JoystickGetAxis.3
-#usr/man/man3/SDL_JoystickGetBall.3
-#usr/man/man3/SDL_JoystickGetButton.3
-#usr/man/man3/SDL_JoystickGetHat.3
-#usr/man/man3/SDL_JoystickIndex.3
-#usr/man/man3/SDL_JoystickName.3
-#usr/man/man3/SDL_JoystickNumAxes.3
-#usr/man/man3/SDL_JoystickNumBalls.3
-#usr/man/man3/SDL_JoystickNumButtons.3
-#usr/man/man3/SDL_JoystickNumHats.3
-#usr/man/man3/SDL_JoystickOpen.3
-#usr/man/man3/SDL_JoystickOpened.3
-#usr/man/man3/SDL_JoystickUpdate.3
-#usr/man/man3/SDL_KeyboardEvent.3
-#usr/man/man3/SDL_KillThread.3
-#usr/man/man3/SDL_ListModes.3
-#usr/man/man3/SDL_LoadBMP.3
-#usr/man/man3/SDL_LoadWAV.3
-#usr/man/man3/SDL_LockAudio.3
-#usr/man/man3/SDL_LockSurface.3
-#usr/man/man3/SDL_LockYUVOverlay.3
-#usr/man/man3/SDL_MapRGB.3
-#usr/man/man3/SDL_MapRGBA.3
-#usr/man/man3/SDL_MixAudio.3
-#usr/man/man3/SDL_MouseButtonEvent.3
-#usr/man/man3/SDL_MouseMotionEvent.3
-#usr/man/man3/SDL_NumJoysticks.3
-#usr/man/man3/SDL_OpenAudio.3
-#usr/man/man3/SDL_Overlay.3
-#usr/man/man3/SDL_Palette.3
-#usr/man/man3/SDL_PauseAudio.3
-#usr/man/man3/SDL_PeepEvents.3
-#usr/man/man3/SDL_PixelFormat.3
-#usr/man/man3/SDL_PollEvent.3
-#usr/man/man3/SDL_PumpEvents.3
-#usr/man/man3/SDL_PushEvent.3
-#usr/man/man3/SDL_Quit.3
-#usr/man/man3/SDL_QuitEvent.3
-#usr/man/man3/SDL_QuitSubSystem.3
-#usr/man/man3/SDL_RWFromFile.3
-#usr/man/man3/SDL_Rect.3
-#usr/man/man3/SDL_RemoveTimer.3
-#usr/man/man3/SDL_ResizeEvent.3
-#usr/man/man3/SDL_SaveBMP.3
-#usr/man/man3/SDL_SemPost.3
-#usr/man/man3/SDL_SemTryWait.3
-#usr/man/man3/SDL_SemValue.3
-#usr/man/man3/SDL_SemWait.3
-#usr/man/man3/SDL_SemWaitTimeout.3
-#usr/man/man3/SDL_SetAlpha.3
-#usr/man/man3/SDL_SetClipRect.3
-#usr/man/man3/SDL_SetColorKey.3
-#usr/man/man3/SDL_SetColors.3
-#usr/man/man3/SDL_SetCursor.3
-#usr/man/man3/SDL_SetEventFilter.3
-#usr/man/man3/SDL_SetGamma.3
-#usr/man/man3/SDL_SetGammaRamp.3
-#usr/man/man3/SDL_SetModState.3
-#usr/man/man3/SDL_SetPalette.3
-#usr/man/man3/SDL_SetTimer.3
-#usr/man/man3/SDL_SetVideoMode.3
-#usr/man/man3/SDL_ShowCursor.3
-#usr/man/man3/SDL_Surface.3
-#usr/man/man3/SDL_SysWMEvent.3
-#usr/man/man3/SDL_ThreadID.3
-#usr/man/man3/SDL_UnlockAudio.3
-#usr/man/man3/SDL_UnlockSurface.3
-#usr/man/man3/SDL_UnlockYUVOverlay.3
-#usr/man/man3/SDL_UpdateRect.3
-#usr/man/man3/SDL_UpdateRects.3
-#usr/man/man3/SDL_UserEvent.3
-#usr/man/man3/SDL_VideoDriverName.3
-#usr/man/man3/SDL_VideoInfo.3
-#usr/man/man3/SDL_VideoModeOK.3
-#usr/man/man3/SDL_WM_GetCaption.3
-#usr/man/man3/SDL_WM_GrabInput.3
-#usr/man/man3/SDL_WM_IconifyWindow.3
-#usr/man/man3/SDL_WM_SetCaption.3
-#usr/man/man3/SDL_WM_SetIcon.3
-#usr/man/man3/SDL_WM_ToggleFullScreen.3
-#usr/man/man3/SDL_WaitEvent.3
-#usr/man/man3/SDL_WaitThread.3
-#usr/man/man3/SDL_WarpMouse.3
-#usr/man/man3/SDL_WasInit.3
-#usr/man/man3/SDL_keysym.3
-#usr/man/man3/SDL_mutexP.3
-#usr/man/man3/SDL_mutexV.3
 #usr/share/aclocal/sdl.m4
+#usr/share/man/man3/SDLKey.3
+#usr/share/man/man3/SDL_ActiveEvent.3
+#usr/share/man/man3/SDL_AddTimer.3
+#usr/share/man/man3/SDL_AudioCVT.3
+#usr/share/man/man3/SDL_AudioSpec.3
+#usr/share/man/man3/SDL_BlitSurface.3
+#usr/share/man/man3/SDL_BuildAudioCVT.3
+#usr/share/man/man3/SDL_CD.3
+#usr/share/man/man3/SDL_CDClose.3
+#usr/share/man/man3/SDL_CDEject.3
+#usr/share/man/man3/SDL_CDName.3
+#usr/share/man/man3/SDL_CDNumDrives.3
+#usr/share/man/man3/SDL_CDOpen.3
+#usr/share/man/man3/SDL_CDPause.3
+#usr/share/man/man3/SDL_CDPlay.3
+#usr/share/man/man3/SDL_CDPlayTracks.3
+#usr/share/man/man3/SDL_CDResume.3
+#usr/share/man/man3/SDL_CDStatus.3
+#usr/share/man/man3/SDL_CDStop.3
+#usr/share/man/man3/SDL_CDtrack.3
+#usr/share/man/man3/SDL_CloseAudio.3
+#usr/share/man/man3/SDL_Color.3
+#usr/share/man/man3/SDL_CondBroadcast.3
+#usr/share/man/man3/SDL_CondSignal.3
+#usr/share/man/man3/SDL_CondWait.3
+#usr/share/man/man3/SDL_CondWaitTimeout.3
+#usr/share/man/man3/SDL_ConvertAudio.3
+#usr/share/man/man3/SDL_ConvertSurface.3
+#usr/share/man/man3/SDL_CreateCond.3
+#usr/share/man/man3/SDL_CreateCursor.3
+#usr/share/man/man3/SDL_CreateMutex.3
+#usr/share/man/man3/SDL_CreateRGBSurface.3
+#usr/share/man/man3/SDL_CreateRGBSurfaceFrom.3
+#usr/share/man/man3/SDL_CreateSemaphore.3
+#usr/share/man/man3/SDL_CreateThread.3
+#usr/share/man/man3/SDL_CreateYUVOverlay.3
+#usr/share/man/man3/SDL_Delay.3
+#usr/share/man/man3/SDL_DestroyCond.3
+#usr/share/man/man3/SDL_DestroyMutex.3
+#usr/share/man/man3/SDL_DestroySemaphore.3
+#usr/share/man/man3/SDL_DisplayFormat.3
+#usr/share/man/man3/SDL_DisplayFormatAlpha.3
+#usr/share/man/man3/SDL_DisplayYUVOverlay.3
+#usr/share/man/man3/SDL_EnableKeyRepeat.3
+#usr/share/man/man3/SDL_EnableUNICODE.3
+#usr/share/man/man3/SDL_Event.3
+#usr/share/man/man3/SDL_EventState.3
+#usr/share/man/man3/SDL_ExposeEvent.3
+#usr/share/man/man3/SDL_FillRect.3
+#usr/share/man/man3/SDL_Flip.3
+#usr/share/man/man3/SDL_FreeCursor.3
+#usr/share/man/man3/SDL_FreeSurface.3
+#usr/share/man/man3/SDL_FreeWAV.3
+#usr/share/man/man3/SDL_FreeYUVOverlay.3
+#usr/share/man/man3/SDL_GL_GetAttribute.3
+#usr/share/man/man3/SDL_GL_GetProcAddress.3
+#usr/share/man/man3/SDL_GL_LoadLibrary.3
+#usr/share/man/man3/SDL_GL_SetAttribute.3
+#usr/share/man/man3/SDL_GL_SwapBuffers.3
+#usr/share/man/man3/SDL_GLattr.3
+#usr/share/man/man3/SDL_GetAppState.3
+#usr/share/man/man3/SDL_GetAudioStatus.3
+#usr/share/man/man3/SDL_GetClipRect.3
+#usr/share/man/man3/SDL_GetCursor.3
+#usr/share/man/man3/SDL_GetError.3
+#usr/share/man/man3/SDL_GetEventFilter.3
+#usr/share/man/man3/SDL_GetGamma.3
+#usr/share/man/man3/SDL_GetGammaRamp.3
+#usr/share/man/man3/SDL_GetKeyName.3
+#usr/share/man/man3/SDL_GetKeyState.3
+#usr/share/man/man3/SDL_GetModState.3
+#usr/share/man/man3/SDL_GetMouseState.3
+#usr/share/man/man3/SDL_GetRGB.3
+#usr/share/man/man3/SDL_GetRGBA.3
+#usr/share/man/man3/SDL_GetRelativeMouseState.3
+#usr/share/man/man3/SDL_GetThreadID.3
+#usr/share/man/man3/SDL_GetTicks.3
+#usr/share/man/man3/SDL_GetVideoInfo.3
+#usr/share/man/man3/SDL_GetVideoSurface.3
+#usr/share/man/man3/SDL_Init.3
+#usr/share/man/man3/SDL_InitSubSystem.3
+#usr/share/man/man3/SDL_JoyAxisEvent.3
+#usr/share/man/man3/SDL_JoyBallEvent.3
+#usr/share/man/man3/SDL_JoyButtonEvent.3
+#usr/share/man/man3/SDL_JoyHatEvent.3
+#usr/share/man/man3/SDL_JoystickClose.3
+#usr/share/man/man3/SDL_JoystickEventState.3
+#usr/share/man/man3/SDL_JoystickGetAxis.3
+#usr/share/man/man3/SDL_JoystickGetBall.3
+#usr/share/man/man3/SDL_JoystickGetButton.3
+#usr/share/man/man3/SDL_JoystickGetHat.3
+#usr/share/man/man3/SDL_JoystickIndex.3
+#usr/share/man/man3/SDL_JoystickName.3
+#usr/share/man/man3/SDL_JoystickNumAxes.3
+#usr/share/man/man3/SDL_JoystickNumBalls.3
+#usr/share/man/man3/SDL_JoystickNumButtons.3
+#usr/share/man/man3/SDL_JoystickNumHats.3
+#usr/share/man/man3/SDL_JoystickOpen.3
+#usr/share/man/man3/SDL_JoystickOpened.3
+#usr/share/man/man3/SDL_JoystickUpdate.3
+#usr/share/man/man3/SDL_KeyboardEvent.3
+#usr/share/man/man3/SDL_KillThread.3
+#usr/share/man/man3/SDL_ListModes.3
+#usr/share/man/man3/SDL_LoadBMP.3
+#usr/share/man/man3/SDL_LoadWAV.3
+#usr/share/man/man3/SDL_LockAudio.3
+#usr/share/man/man3/SDL_LockSurface.3
+#usr/share/man/man3/SDL_LockYUVOverlay.3
+#usr/share/man/man3/SDL_MapRGB.3
+#usr/share/man/man3/SDL_MapRGBA.3
+#usr/share/man/man3/SDL_MixAudio.3
+#usr/share/man/man3/SDL_MouseButtonEvent.3
+#usr/share/man/man3/SDL_MouseMotionEvent.3
+#usr/share/man/man3/SDL_NumJoysticks.3
+#usr/share/man/man3/SDL_OpenAudio.3
+#usr/share/man/man3/SDL_Overlay.3
+#usr/share/man/man3/SDL_Palette.3
+#usr/share/man/man3/SDL_PauseAudio.3
+#usr/share/man/man3/SDL_PeepEvents.3
+#usr/share/man/man3/SDL_PixelFormat.3
+#usr/share/man/man3/SDL_PollEvent.3
+#usr/share/man/man3/SDL_PumpEvents.3
+#usr/share/man/man3/SDL_PushEvent.3
+#usr/share/man/man3/SDL_Quit.3
+#usr/share/man/man3/SDL_QuitEvent.3
+#usr/share/man/man3/SDL_QuitSubSystem.3
+#usr/share/man/man3/SDL_RWFromFile.3
+#usr/share/man/man3/SDL_Rect.3
+#usr/share/man/man3/SDL_RemoveTimer.3
+#usr/share/man/man3/SDL_ResizeEvent.3
+#usr/share/man/man3/SDL_SaveBMP.3
+#usr/share/man/man3/SDL_SemPost.3
+#usr/share/man/man3/SDL_SemTryWait.3
+#usr/share/man/man3/SDL_SemValue.3
+#usr/share/man/man3/SDL_SemWait.3
+#usr/share/man/man3/SDL_SemWaitTimeout.3
+#usr/share/man/man3/SDL_SetAlpha.3
+#usr/share/man/man3/SDL_SetClipRect.3
+#usr/share/man/man3/SDL_SetColorKey.3
+#usr/share/man/man3/SDL_SetColors.3
+#usr/share/man/man3/SDL_SetCursor.3
+#usr/share/man/man3/SDL_SetEventFilter.3
+#usr/share/man/man3/SDL_SetGamma.3
+#usr/share/man/man3/SDL_SetGammaRamp.3
+#usr/share/man/man3/SDL_SetModState.3
+#usr/share/man/man3/SDL_SetPalette.3
+#usr/share/man/man3/SDL_SetTimer.3
+#usr/share/man/man3/SDL_SetVideoMode.3
+#usr/share/man/man3/SDL_ShowCursor.3
+#usr/share/man/man3/SDL_Surface.3
+#usr/share/man/man3/SDL_SysWMEvent.3
+#usr/share/man/man3/SDL_ThreadID.3
+#usr/share/man/man3/SDL_UnlockAudio.3
+#usr/share/man/man3/SDL_UnlockSurface.3
+#usr/share/man/man3/SDL_UnlockYUVOverlay.3
+#usr/share/man/man3/SDL_UpdateRect.3
+#usr/share/man/man3/SDL_UpdateRects.3
+#usr/share/man/man3/SDL_UserEvent.3
+#usr/share/man/man3/SDL_VideoDriverName.3
+#usr/share/man/man3/SDL_VideoInfo.3
+#usr/share/man/man3/SDL_VideoModeOK.3
+#usr/share/man/man3/SDL_WM_GetCaption.3
+#usr/share/man/man3/SDL_WM_GrabInput.3
+#usr/share/man/man3/SDL_WM_IconifyWindow.3
+#usr/share/man/man3/SDL_WM_SetCaption.3
+#usr/share/man/man3/SDL_WM_SetIcon.3
+#usr/share/man/man3/SDL_WM_ToggleFullScreen.3
+#usr/share/man/man3/SDL_WaitEvent.3
+#usr/share/man/man3/SDL_WaitThread.3
+#usr/share/man/man3/SDL_WarpMouse.3
+#usr/share/man/man3/SDL_WasInit.3
+#usr/share/man/man3/SDL_keysym.3
+#usr/share/man/man3/SDL_mutexP.3
+#usr/share/man/man3/SDL_mutexV.3
diff --git a/lfs/sdl b/lfs/sdl
index 5f5ecdcef4..84c395a3a2 100644
--- a/lfs/sdl
+++ b/lfs/sdl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.11
+VER        = 1.2.15
 
 THISAPP    = SDL-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sdl
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "alsa"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 418b42956b7cd103bfab1b9077ccc149
+$(DL_FILE)_MD5 = 9d96df8417572a2afb781a7c4c811a85
 
 install : $(TARGET)
 
@@ -77,8 +77,6 @@ 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
diff --git a/src/patches/SDL-1.2.11-asm-page.h.patch b/src/patches/SDL-1.2.11-asm-page.h.patch
deleted file mode 100644
index ece702d8d8..0000000000
--- a/src/patches/SDL-1.2.11-asm-page.h.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -urN SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c
---- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c	2006-05-17 06:16:06.000000000 +0300
-+++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c	2007-06-24 22:19:41.000000000 +0300
-@@ -29,9 +29,17 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
--#include <asm/page.h>		/* For definition of PAGE_SIZE */
- #include <linux/vt.h>
- 
-+#if defined(linux)
-+#define HAS_MMAP_ANON
-+#include <sys/types.h>
-+#include <sys/mman.h>
-+#include <asm/page.h>   /* PAGE_SIZE */
-+#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
-+#define HAS_GETPAGESIZE
-+#endif /* linux */
-+
- #include "SDL_video.h"
- #include "SDL_mouse.h"
- #include "../SDL_sysvideo.h"
-@@ -474,6 +482,7 @@
- 	unsigned int current_h;
- 	const char *SDL_fbdev;
- 	FILE *modesdb;
-+	int pagesize = -1;
- 
- 	/* Initialize the library */
- 	SDL_fbdev = SDL_getenv("SDL_FBDEV");
-@@ -545,9 +554,27 @@
- 		}
- 	}
- 
-+#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE)
-+	pagesize = sysconf(_SC_PAGESIZE);
-+#endif
-+#ifdef _SC_PAGE_SIZE
-+	if (pagesize == -1)
-+		pagesize = sysconf(_SC_PAGE_SIZE);
-+#endif
-+#ifdef HAS_GETPAGESIZE
-+	if (pagesize == -1)
-+		pagesize = getpagesize();
-+#endif
-+#ifdef PAGE_SIZE
-+	if (pagesize == -1)
-+		pagesize = PAGE_SIZE;
-+#endif
-+	if (pagesize == -1)
-+		pagesize = 4096;
-+
- 	/* Memory map the device, compensating for buggy PPC mmap() */
- 	mapped_offset = (((long)finfo.smem_start) -
--	                (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
-+	                (((long)finfo.smem_start)&~(pagesize-1)));
- 	mapped_memlen = finfo.smem_len+mapped_offset;
- 	mapped_mem = do_mmap(NULL, mapped_memlen,
- 	                  PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);