mr_bones_ 15/01/10 05:38:19 Added: openttd-1.4.4-cflags.patch openttd-1.4.4-freetype.patch Log: version bump with patch updates from Poly-C on bug #526570 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.1 games-simulation/openttd/files/openttd-1.4.4-cflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.4.4-cflags.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.4.4-cflags.patch?rev=1.1&content-type=text/plain Index: openttd-1.4.4-cflags.patch =================================================================== --- openttd-1.4.4/config.lib +++ openttd-1.4.4/config.lib @@ -1450,12 +1450,6 @@ CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" LDFLAGS="$LDFLAGS -noixemul" fi - - if [ "$enable_profiling" = "0" ]; then - # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) - CFLAGS="-fomit-frame-pointer $CFLAGS" - fi - CFLAGS="-O2 $CFLAGS" else OBJS_SUBDIR="debug" @@ -1466,14 +1460,6 @@ CFLAGS="$CFLAGS -G0" fi fi - if [ $enable_debug -ge 2 ]; then - CFLAGS="$CFLAGS -fno-inline" - fi - if [ $enable_debug -ge 3 ]; then - CFLAGS="$CFLAGS -O0" - else - CFLAGS="$CFLAGS -O2" - fi fi if [ $enable_debug -le 2 ]; then @@ -1498,11 +1484,6 @@ CFLAGS="$CFLAGS -fno-expensive-optimizations" fi - if [ "$enable_profiling" != "0" ]; then - CFLAGS="$CFLAGS -pg" - LDFLAGS="$LDFLAGS -pg" - fi - if [ "$with_threads" = "0" ]; then CFLAGS="$CFLAGS -DNO_THREADS" fi 1.1 games-simulation/openttd/files/openttd-1.4.4-freetype.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.4.4-freetype.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.4.4-freetype.patch?rev=1.1&content-type=text/plain Index: openttd-1.4.4-freetype.patch =================================================================== Index: trunk/src/fontcache.cpp =================================================================== --- trunk/src/fontcache.cpp (revision 27020) +++ trunk/src/fontcache.cpp (revision 27079) @@ -537,6 +537,6 @@ /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ - int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); - int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); + unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); + unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); /* Limit glyph size to prevent overflows later on. */ @@ -554,6 +554,6 @@ /* Draw shadow for medium size */ if (this->fs == FS_NORMAL && !aa) { - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; @@ -564,6 +564,6 @@ } - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[x + y * sprite.width].m = FACE_COLOUR;