[mupen64plus-video-rice] 115/191: Fix symbol references for non-PIC builds

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit dcc189d4f656c89a9742e2d60f56ca2318febeb9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Mar 21 20:11:29 2012 +0100

    Fix symbol references for non-PIC builds
---
 debian/changelog                   |  4 +++
 debian/patches/non-pic-build.patch | 63 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 68 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 258a219..ec7fe62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ mupen64plus-video-rice (1.99.5-2) UNRELEASED; urgency=low
   [ Simon Ruderich ]
   * Let debhelper set the buildflags implicitly
 
+  [ Sven Eckelmann ]
+  * debian/patches:
+    - Add non-pic-build.patch, Fix symbol references for non-PIC builds
+
  -- Sven Eckelmann <sven at narfation.org>  Sun, 18 Mar 2012 16:52:52 +0100
 
 mupen64plus-video-rice (1.99.5-1) unstable; urgency=low
diff --git a/debian/patches/non-pic-build.patch b/debian/patches/non-pic-build.patch
new file mode 100644
index 0000000..2ea516c
--- /dev/null
+++ b/debian/patches/non-pic-build.patch
@@ -0,0 +1,63 @@
+Description: Fix symbol references for non-PIC builds
+Author: Richard Goedeken <Richard at fascinationsoftware.com>
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/09de024e3784
+
+---
+diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
+index f6c712f145358813b25a9a87426f11105ce4c942..ee61b2e969c8eb7cd6203d1f6b6a18b0cadf8649 100644
+--- a/src/FrameBuffer.cpp
++++ b/src/FrameBuffer.cpp
+@@ -667,30 +667,30 @@ l1:             mov esi, [ecx+ebx]
+                      );
+ #elif !defined(NO_ASM)
+ # if !defined(__PIC__)
+-           asm volatile("pusha                             \n"
+-                "mov    pAsmStart, %%ecx           \n"  // = pStart
+-                "mov    $0, %%edx                  \n"          // The CRC
+-                "mov    dwAsmHeight, %%eax         \n"  // = y
+-                "0:                                \n" //l2:
+-                "mov    dwAsmdwBytesPerLine, %%ebx \n"  // = x
+-                "sub    $4, %%ebx                  \n"
+-                "1:                                \n" //l1:
+-                "mov    (%%ecx,%%ebx), %%esi       \n"
+-                "xor %%ebx, %%esi                  \n"
+-                "rol $4, %%edx                     \n"
+-                "add %%esi, %%edx                  \n"
+-                "sub    $4, %%ebx                  \n"
+-                "jge 1b                            \n" //jge l1
+-                "xor %%eax, %%esi                  \n"
+-                "add %%esi, %%edx                  \n"
+-                "add dwAsmPitch, %%ecx             \n"
+-                "dec %%eax                         \n"
+-                "jge 0b                            \n" //jge l2
++           asm volatile("pusha                        \n"
++                "mov    %[pAsmStart], %%ecx           \n"  // = pStart
++                "mov    $0, %%edx                     \n"          // The CRC
++                "mov    %[dwAsmHeight], %%eax         \n"  // = y
++                "0:                                   \n" //l2:
++                "mov    %[dwAsmdwBytesPerLine], %%ebx \n"  // = x
++                "sub    $4, %%ebx                     \n"
++                "1:                                   \n" //l1:
++                "mov    (%%ecx,%%ebx), %%esi          \n"
++                "xor %%ebx, %%esi                     \n"
++                "rol $4, %%edx                        \n"
++                "add %%esi, %%edx                     \n"
++                "sub    $4, %%ebx                     \n"
++                "jge 1b                               \n" //jge l1
++                "xor %%eax, %%esi                     \n"
++                "add %%esi, %%edx                     \n"
++                "add %[dwAsmPitch], %%ecx             \n"
++                "dec %%eax                            \n"
++                "jge 0b                               \n" //jge l2
+                 
+-                "mov    %%edx, dwAsmCRC            \n"
+-                "popa                              \n"
+-                :
+-                :
++                "mov    %%edx, %[dwAsmCRC]            \n"
++                "popa                                 \n"
++                : [pAsmStart]"+m"(pAsmStart), [dwAsmHeight]"+m"(dwAsmHeight), [dwAsmCRC]"=m"(dwAsmCRC)
++                : [dwAsmdwBytesPerLine]"m"(dwAsmdwBytesPerLine), [dwAsmPitch]"m"(dwAsmPitch)
+                 : "memory", "cc"
+                 );
+ # else // defined(__PIC__)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..82251aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+non-pic-build.patch

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