[mupen64plus-video-rice] 136/191: Remove upstream merged ftbfs_x86_sse.patch

[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 530fd7c20fb5e3aa48dee4b8f3e64f23f61c37cb
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Feb 8 09:54:52 2013 +0100

    Remove upstream merged ftbfs_x86_sse.patch
---
 debian/changelog                   |  2 ++
 debian/patches/ftbfs_x86_sse.patch | 25 -------------------------
 debian/patches/series              |  1 -
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2319f9..d38aa5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus-video-rice (1.99.5+28+ea7ca05dfce8-1) UNRELEASED; urgency=low
   * New Upstream Snapshot from ea7ca05dfce863a0801d05e811b34c3722d96adb
   * Disable extra debug code in release builds with -DNDEBUG in
     debian/rules
+  * debian/patches:
+    * Remove upstream merged ftbfs_x86_sse.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 10 Dec 2012 18:38:04 +0100
 
diff --git a/debian/patches/ftbfs_x86_sse.patch b/debian/patches/ftbfs_x86_sse.patch
deleted file mode 100644
index ea3dc24..0000000
--- a/debian/patches/ftbfs_x86_sse.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix build on x86 with SSE inline assembler
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 3bbe88651031f513d38b33aa121277e36d6c353e..a30b251d200ff205c6959a5856f1335b304590fa 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -112,13 +112,15 @@ ifeq ("$(CPU)","NONE")
-   $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
- endif
- 
-+
-+
- # base CFLAGS, LDLIBS, and LDFLAGS
- OPTFLAGS ?= -O3
- CFLAGS += $(OPTFLAGS) -Wall -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
- CXXFLAGS += -fvisibility-inlines-hidden
- LDFLAGS += $(SHARED)
- 
--ifeq ($(CPU), "X86")
-+ifeq ($(CPU), X86)
-   CFLAGS += -msse
- endif
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 245c787..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ftbfs_x86_sse.patch

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