This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit c92f6416c6389b69701a8c210ceee2d72b63b7d9 Author: Sven Eckelmann <[email protected]> Date: Wed Jun 10 00:12:29 2009 +0200 Add 110-glide64-noasm.patch, don't use x86-asm on non-x86 plattforms --- debian/changelog | 8 ++++++++ debian/patches/110-glide64-noasm.patch | 35 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 44 insertions(+) diff --git a/debian/changelog b/debian/changelog index b93ad52..b4c8028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low + + * debian/patches: + - Add 110-glide64-noasm.patch, don't use x86-asm on non-x86 plattforms + in glide64 + + -- Sven Eckelmann <[email protected]> Wed, 10 Jun 2009 00:11:40 +0200 + mupen64plus (1.5+dfsg1-1) unstable; urgency=low [ Sven Eckelmann ] diff --git a/debian/patches/110-glide64-noasm.patch b/debian/patches/110-glide64-noasm.patch new file mode 100644 index 0000000..ce8b362 --- /dev/null +++ b/debian/patches/110-glide64-noasm.patch @@ -0,0 +1,35 @@ +From 43c4edc94a685737426cb8483b588b07589e36b2 Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Wed, 10 Jun 2009 00:10:03 +0200 +Subject: [PATCH] Don't include x86-asm in non-x86 plattforms + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + glide64/rdp.cpp | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/glide64/rdp.cpp b/glide64/rdp.cpp +index eec21d3..d2aa4b6 100644 +--- a/glide64/rdp.cpp ++++ b/glide64/rdp.cpp +@@ -60,8 +60,14 @@ DWORD frame_count; // frame counter + BOOL ucode_error_report = TRUE; + int wrong_tile = -1; + +-#define BYTESWAP1(s1) asm volatile (" bswap %0; " : "+r" (s1) : :); +-#define BYTESWAP2(s1,s2) asm volatile (" bswap %0; bswap %1; " : "+r" (s1), "+r" (s2) : :); ++#if defined(NO_ASM) ++ #define BYTESWAP1(s1) s1 = ((s1 & 0xff) << 24) | ((s1 & 0xff00) << 8) | ((s1 & 0xff0000) >> 8) | ((s1 & 0xff000000) >> 24); ++ #define BYTESWAP2(s1,s2) s1 = ((s1 & 0xff) << 24) | ((s1 & 0xff00) << 8) | ((s1 & 0xff0000) >> 8) | ((s1 & 0xff000000) >> 24); \ ++ s2 = ((s2 & 0xff) << 24) | ((s2 & 0xff00) << 8) | ((s2 & 0xff0000) >> 8) | ((s2 & 0xff000000) >> 24); ++#else ++ #define BYTESWAP1(s1) asm volatile (" bswap %0; " : "+r" (s1) : :); ++ #define BYTESWAP2(s1,s2) asm volatile (" bswap %0; bswap %1; " : "+r" (s1), "+r" (s2) : :); ++#endif + + // global strings + const char *ACmp[4] = { "NONE", "THRESHOLD", "UNKNOWN", "DITHER" }; +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index 8e922b3..26acd18 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 107-system-libbz2.patch 108-remove-gln64.patch 109-remove-nondfsg-icons.patch +110-glide64-noasm.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
