[aseprite] 01/01: Cherry-pick patch for #790478 from upstream.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 98383af6466eda74275f86f3fa1410328f49775a
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Wed Jul 15 15:05:56 2015 +0200

    Cherry-pick patch for #790478 from upstream.
---
 debian/changelog                           |  6 +++---
 debian/patches/dont_use_x86_assembly.patch | 34 ++++++++++++++++++++++++++++++
 debian/patches/eax_only_on_x86.patch       | 16 --------------
 debian/patches/series                      |  2 +-
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ed3062..fd51a1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-aseprite (1.0.9+ds-3) UNRELEASED; urgency=medium
+aseprite (1.0.9+ds-3) unstable; urgency=medium
 
-  * debian/patches/eax_only_on_x86.patch:
+  * debian/patches/dont_use_x86_assembly.patch:
     - Added. Fixes FTBFS with GCC 5. (Closes: #790478)
 
- -- Tobias Hansen <thansen at debian.org>  Wed, 15 Jul 2015 00:38:44 +0200
+ -- Tobias Hansen <thansen at debian.org>  Wed, 15 Jul 2015 15:04:27 +0200
 
 aseprite (1.0.9+ds-2) unstable; urgency=medium
 
diff --git a/debian/patches/dont_use_x86_assembly.patch b/debian/patches/dont_use_x86_assembly.patch
new file mode 100644
index 0000000..02794c3
--- /dev/null
+++ b/debian/patches/dont_use_x86_assembly.patch
@@ -0,0 +1,34 @@
+From 3390509cada10b08f240f0e533d3e69c6d81bdd1 Mon Sep 17 00:00:00 2001
+From: David Capello <davidcapello at gmail.com>
+Date: Wed, 15 Jul 2015 09:41:53 -0300
+Subject: [PATCH] Fix compilation problems with gcc 5 in non-x86 cpu
+ architectures
+
+Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790478
+---
+ src/raster/palette.cpp | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/src/raster/palette.cpp
++++ b/src/raster/palette.cpp
+@@ -1,5 +1,5 @@
+ /* Aseprite
+- * Copyright (C) 2001-2014  David Capello
++ * Copyright (C) 2001-2015  David Capello
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -427,12 +427,7 @@
+ 
+ int Palette::findBestfit(int r, int g, int b, int mask_index) const
+ {
+-#ifdef __GNUC__
+-  register int bestfit asm("%eax");
+-#else
+-  register int bestfit;
+-#endif
+-  int i, coldiff, lowest;
++  int i, coldiff, lowest, bestfit;
+ 
+   ASSERT(r >= 0 && r <= 255);
+   ASSERT(g >= 0 && g <= 255);
diff --git a/debian/patches/eax_only_on_x86.patch b/debian/patches/eax_only_on_x86.patch
deleted file mode 100644
index 0791a61..0000000
--- a/debian/patches/eax_only_on_x86.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use x86 register eax only on x86 architectures
- Otherwise it FTBFS e.g. on arm64 with GCC 5.
-Author: Tobias Hansen <thansen at debian.org>
-Bug-Debian: http://bugs.debian.org/790478
-
---- a/src/raster/palette.cpp
-+++ b/src/raster/palette.cpp
-@@ -427,7 +427,7 @@
- 
- int Palette::findBestfit(int r, int g, int b, int mask_index) const
- {
--#ifdef __GNUC__
-+#if defined(__GNUC__) && ( defined(__i386__) || defined(__x86_64__) )
-   register int bestfit asm("%eax");
- #else
-   register int bestfit;
diff --git a/debian/patches/series b/debian/patches/series
index 520c1da..5bb6b16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,4 @@ disable-file-and-gif-tests.patch
 disable-resize_image_tests.patch
 resizing_from_options_gui.patch
 find_libpixman.patch
-eax_only_on_x86.patch
+dont_use_x86_assembly.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git