[mupen64plus-video-glide64] 160/172: Remove upstream merged patches

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.

commit 7487a48e1f90dba871f3c45890fc6e487c5c5961
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 5 12:14:09 2014 +0200

    Remove upstream merged patches
---
 debian/changelog                        |  2 ++
 debian/patches/llvm_builtin_ftbfs.patch | 37 ---------------------------------
 debian/patches/printf_fixup.patch       |  2 +-
 debian/patches/series                   |  1 -
 4 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3af962..95fffa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mupen64plus-video-glide64 (2.0.0+27+gd644aca-1) UNRELEASED; urgency=medium
 
   * New Upstream Snapshot from d644acacb44313b5b7d9dfac9324925327eb14dd
+  * debian/patches:
+    - Remove upstream merged llvm_builtin_ftbfs.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 12:13:04 +0200
 
diff --git a/debian/patches/llvm_builtin_ftbfs.patch b/debian/patches/llvm_builtin_ftbfs.patch
deleted file mode 100644
index 1106c4b..0000000
--- a/debian/patches/llvm_builtin_ftbfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Use SSE intrinsics instead of GCC specific __builtin functions
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/3dmath.cpp b/src/3dmath.cpp
-index 79ff2035eda57e11a76f55c5efb583592678d6fd..a12675c5fd5644db0ee6d033d4af07ea457fb2aa 100755
---- a/src/3dmath.cpp
-+++ b/src/3dmath.cpp
-@@ -186,14 +186,14 @@ void __stdcall MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
- #if defined(__GNUC__) && !defined(NO_ASM)
-     /* [row][col]*/
-     typedef float v4sf __attribute__ ((vector_size (16)));
--    v4sf row0 = __builtin_ia32_loadups(m2[0]);
--    v4sf row1 = __builtin_ia32_loadups(m2[1]);
--    v4sf row2 = __builtin_ia32_loadups(m2[2]);
--    v4sf row3 = __builtin_ia32_loadups(m2[3]);
-+    v4sf row0 = _mm_loadu_ps(m2[0]);
-+    v4sf row1 = _mm_loadu_ps(m2[1]);
-+    v4sf row2 = _mm_loadu_ps(m2[2]);
-+    v4sf row3 = _mm_loadu_ps(m2[3]);
- 
-     for (int i = 0; i < 4; ++i)
-     {
--    v4sf leftrow = __builtin_ia32_loadups(m1[i]);
-+    v4sf leftrow = _mm_loadu_ps(m1[i]);
-     
-     // Fill tmp with four copies of leftrow[0]
-     v4sf tmp = leftrow;
-@@ -216,7 +216,7 @@ void __stdcall MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
-     tmp = _mm_shuffle_ps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6));
-     destrow += tmp * row3;
-     
--    __builtin_ia32_storeups(r[i], destrow);
-+    _mm_storeu_ps(r[i], destrow);
-     }
- #elif !defined(NO_ASM)
-     __asm
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index 8bc0661..5828c98 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -49,7 +49,7 @@ index f8d629fe9686e9f2fb6f8dba8c2172f93393db66..fee99153c0088ad0af12658b38db2ce0
  {
  #ifdef RDP_ERROR_LOG
 diff --git a/src/m64p.h b/src/m64p.h
-index 39573e06f61c45eb13d1b51b23c1c86edb356438..422be9e252cdd538a504ae2e3b630687badda45a 100755
+index 1185bd96d9c08ec09690b1bd6e86b8711b757736..693ae2d9385fcbddf765a5a38642495d082a59bd 100755
 --- a/src/m64p.h
 +++ b/src/m64p.h
 @@ -37,7 +37,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 3e38fc1..5a5a78d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 printf_fixup.patch
-llvm_builtin_ftbfs.patch

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