public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openttd: update from 1.4.4 to 1.5.1

Browse Source
This commit is contained in:
Nixpkgs Monitor 2015-06-07 14:57:29 +02:00 committed by Moritz Ulrich
parent ab8561e3e5
commit c25027f210
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/openttd/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openttd-${version}"; name = "openttd-${version}";
version = "1.4.4"; version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9";
}; };
buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];
@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
"--without-liblzo2" "--without-liblzo2"
]; ];
# NOTE: Remove this patch in 1.4.5 or greater
patches = [
# Adapted from svn r27079
./fix-freetype-1.4.4.patch
];
makeFlags = "INSTALL_PERSONAL_DIR="; makeFlags = "INSTALL_PERSONAL_DIR=";
postInstall = '' postInstall = ''

31
pkgs/games/openttd/fix-freetype-1.4.4.patch
View File

@ -1,31 +0,0 @@
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
===================================================================
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -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;