Hello community, here is the log from the commit of package SDL checked in at Fri Jun 2 01:16:43 CEST 2006. -------- --- SDL/SDL.changes 2006-05-31 17:47:48.000000000 +0200 +++ SDL/SDL.changes 2006-06-01 17:12:49.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 1 17:12:03 CEST 2006 - nadvornik@suse.cz + +- use upstream patch for 32 visuals bug [#178725] + +------------------------------------------------------------------- Old: ---- SDL-1.2.9-no-32bit-visual.patch New: ---- SDL-1.2.9-fix-32bit-visual.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.A8UAe3/_old 2006-06-02 01:15:00.000000000 +0200 +++ /var/tmp/diff_new_pack.A8UAe3/_new 2006-06-02 01:15:00.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Libraries Autoreqprov: on Version: 1.2.9 -Release: 19 +Release: 20 Summary: Simple DirectMedia Layer Library Source: SDL-%{version}.tar.bz2 Patch: SDL-%{version}.dif @@ -34,7 +34,7 @@ Patch16: nonexec-stack.diff Patch17: SDL-%{version}-try_alsa_first.patch Patch18: SDL-%{version}-padding.patch -Patch19: SDL-%{version}-no-32bit-visual.patch +Patch19: SDL-%{version}-fix-32bit-visual.patch Provides: sdl Obsoletes: sdl URL: http://www.libsdl.org/ @@ -147,6 +147,8 @@ %{_mandir}/*/* %changelog -n SDL +* Thu Jun 01 2006 - nadvornik@suse.cz +- use upstream patch for 32 visuals bug [#178725] * Wed May 31 2006 - nadvornik@suse.cz - do not use depth 32 visuals [#178725] * Fri Mar 10 2006 - bk@suse.de ++++++ SDL-1.2.9-fix-32bit-visual.patch ++++++ --- src/video/x11/SDL_x11video.c 2006/04/17 03:58:29 2199 +++ src/video/x11/SDL_x11video.c 2006/04/17 04:54:08 2200 @@ -557,6 +557,9 @@ vformat->Gmask = SDL_Visual->green_mask; vformat->Bmask = SDL_Visual->blue_mask; } + if ( this->hidden->depth == 32 ) { + vformat->Amask = (0xFFFFFFFF & ~(vformat->Rmask|vformat->Gmask|vformat->Bmask)); + } X11_SaveVidModeGamma(this); /* See if we have been passed a window to use */ @@ -772,6 +775,7 @@ int i, depth; Visual *vis; int vis_change; + Uint32 Amask; /* If a window is already present, destroy it and start fresh */ if ( SDL_Window ) { @@ -822,9 +826,15 @@ this->hidden->depth = depth; /* Allocate the new pixel format for this video mode */ + if ( this->hidden->depth == 32 ) { + Amask = (0xFFFFFFFF & ~(vis->red_mask|vis->green_mask|vis->blue_mask)); + } else { + Amask = 0; + } if ( ! SDL_ReallocFormat(screen, bpp, - vis->red_mask, vis->green_mask, vis->blue_mask, 0) ) + vis->red_mask, vis->green_mask, vis->blue_mask, Amask) ) { return -1; + } /* Create the appropriate colormap */ if ( SDL_XColorMap != SDL_DisplayColormap ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de