On Sat, May 02 2020, Charlene Wendling <[email protected]> wrote: > On Sat, 2 May 2020 00:38:01 +0200 > Charlene Wendling wrote: > >> On Fri, 01 May 2020 15:46:55 -0600 >> Anthony J. Bentley wrote: >> >> > Charlene Wendling writes: >> > > On Fri, 01 May 2020 12:10:34 -0600 >> > > Anthony J. Bentley wrote: >> > > >> > > > Charlene Wendling writes: >> > > > > Hi, >> > > > > >> > > > > Some texture colors are off on powerpc, upstream thinks it's >> > > > > likely related to the old OpenGL versions or driver used on >> > > > > macppc machines[0]. It's an obvious reminder, but all OpenGL >> > > > > capable macppc machine are radeon(4) only. >> > > > > >> > > > > As such i'm proposing to mark it NOT_FOR_ARCHS, this saves 6 >> > > > > bulk machine hours. >> > > > > >> > > > > OK? >> > > > >> > > > Out of curiosity, does using software rendering look better? >> > > >> > > After a few minutes, the result is the same :) >> > >> > I'm speaking mostly from ignorance here, but this seems to suggest >> > that it's not about the old OpenGL version; looking at glxinfo on >> > one of my OpenGL 2.1 laptops, software rendering gives me OpenGL 3.3 >> > through llvmpipe. >> >> Even "native" and commercial Mac OS X games like postal have colors >> off on macppc, making things difficult to analyse as i don't know >> much as well, especially that i don't have Mac OS X on my macs so i >> can't cross test without reinstalling; i don't have a spare IDE 2.5 >> disk. >> > > So, as said somewhere else, i've pulled the trigger too early, another > upstream member had a good guess :)
This has been merged into master upstream. Diff looks good, build on amd64 / little-endian appears unaffected. ok jca@ > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/widelands/Makefile,v > retrieving revision 1.29 > diff -u -p -u -p -r1.29 Makefile > --- Makefile 1 May 2020 21:17:03 -0000 1.29 > +++ Makefile 2 May 2020 17:01:59 -0000 > @@ -1,8 +1,5 @@ > # $OpenBSD: Makefile,v 1.29 2020/05/01 21:17:03 cwen Exp $ > > -# See https://github.com/widelands/widelands/issues/3887 > -NOT_FOR_ARCHS = powerpc > - > COMMENT= economic and military simulation game > > V = 20 > @@ -10,7 +7,7 @@ DISTNAME = widelands-build${V} > PKGNAME= widelands-0.${V} > CATEGORIES= games > EXTRACT_SUFX= .tar.bz2 > -REVISION= 1 > +REVISION= 2 > > HOMEPAGE= https://wl.widelands.org/ > MASTER_SITES = > https://launchpad.net/widelands/build${V}/build${V}/+download/ > Index: patches/patch-src_graphic_sdl_utils_cc > =================================================================== > RCS file: patches/patch-src_graphic_sdl_utils_cc > diff -N patches/patch-src_graphic_sdl_utils_cc > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_graphic_sdl_utils_cc 2 May 2020 17:01:59 -0000 > @@ -0,0 +1,19 @@ > +$OpenBSD$ > + > +Fix colors on powerpc, see > +https://github.com/widelands/widelands/pull/3890 > + > +Index: src/graphic/sdl_utils.cc > +--- src/graphic/sdl_utils.cc.orig > ++++ src/graphic/sdl_utils.cc > +@@ -23,6 +23,10 @@ > + > + SDL_Surface* empty_sdl_surface(int16_t w, int16_t h) { > + SDL_Surface* const surface = > ++#if SDL_BYTEORDER == SDL_LIL_ENDIAN > + SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, 0x000000ff, > 0x0000ff00, 0x00ff0000, 0xff000000); > ++#else > ++ SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, 0xff000000, > 0x00ff0000, 0x0000ff00, 0x000000ff); > ++#endif > + return surface; > + } > > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
