From 6863ea1e6f7693049b086093c605c3cef672e62b1a3601ba2cab8d0e5d208221 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Tue, 15 Dec 2015 11:14:35 +0000
Subject: [PATCH] Accepting request 348952 from home:plater

Fixed i586 build

OBS-URL: https://build.opensuse.org/request/show/348952
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=7
---
 buzztrax-fixx86build.patch      | 13 ++++++++++++
 buzztrax-nolibbml_la-bmlw.patch | 36 +++++++++++++++++++++++++++++++++
 buzztrax.changes                |  6 ++++++
 buzztrax.spec                   | 18 ++++++++++++++---
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 buzztrax-fixx86build.patch
 create mode 100644 buzztrax-nolibbml_la-bmlw.patch

diff --git a/buzztrax-fixx86build.patch b/buzztrax-fixx86build.patch
new file mode 100644
index 0000000..aaeb999
--- /dev/null
+++ b/buzztrax-fixx86build.patch
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -21763,7 +21763,7 @@ fi
+ ARCH_CFLAGS=""
+ ARCH_CPPFLAGS=""
+ case "x${target_cpu}" in
+-  xi?86|k?|xx86_64|xamd64)
++  k?|xx86_64|xamd64)
+     # seems to cause "CPU you selected does not support x86-64 instruction set" on some targets
+     #ARCH_CFLAGS="-march=native"
+     ARCH_CPPFLAGS="-D__SSE__ -D__MMX__"
diff --git a/buzztrax-nolibbml_la-bmlw.patch b/buzztrax-nolibbml_la-bmlw.patch
new file mode 100644
index 0000000..1e2ebf0
--- /dev/null
+++ b/buzztrax-nolibbml_la-bmlw.patch
@@ -0,0 +1,36 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -19702,7 +19702,7 @@ BMLHOST_CCASFLAGS=""
+ case "x${target_cpu}" in
+   xi?86 | k?)
+     HAVE_X86=yes
+-    CALLING_MODE=direct
++    CALLING_MODE=void
+     ;;
+   xx86_64|xamd64)
+         if test "$have_x32_h" = "xno"; then
+@@ -19761,7 +19761,8 @@ else
+   USE_DLLWRAPPER_TRUE='#'
+   USE_DLLWRAPPER_FALSE=
+ fi
+-
++echo "dlltrue=$USE_DLLWRAPPER_FALSE"
++echo "dlltrue=$USE_DLLWRAPPER_TRUE"
+  if test x$CALLING_MODE = xdirect; then
+   USE_DLLWRAPPER_DIRECT_TRUE=
+   USE_DLLWRAPPER_DIRECT_FALSE='#'
+@@ -19778,6 +19779,12 @@ else
+   USE_DLLWRAPPER_IPC_FALSE=
+ fi
+ 
++echo "dllfalse=$USE_DLLWRAPPER_FALSE"
++echo "dlltrue=$USE_DLLWRAPPER_TRUE"
++echo "dllfalseipc=$USE_DLLWRAPPER_IPC_FALSE"
++echo "dlltrueipc=$USE_DLLWRAPPER_IPC_TRUE"
++echo "dllfalse=$USE_DLLWRAPPER_DIRECT_FALSE"
++echo "dlltrue=$USE_DLLWRAPPER_DIRECT_TRUE"
+ 
+ 
+ 
diff --git a/buzztrax.changes b/buzztrax.changes
index 25c9d80..f435a2c 100644
--- a/buzztrax.changes
+++ b/buzztrax.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 15 11:10:24 UTC 2015 - davejplater@gmail.com
+
+- Fixed i586 build with buzztrax-fixx86build.patch and
+  buzztrax-nolibbml_la-bmlw.patch
+
 -------------------------------------------------------------------
 Mon Dec 14 08:46:22 UTC 2015 - davejplater@gmail.com
 
diff --git a/buzztrax.spec b/buzztrax.spec
index 630e8bd..23886ff 100644
--- a/buzztrax.spec
+++ b/buzztrax.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package buzztrax
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,12 @@ Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://sourceforge.net/projects/buzztard/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        COPYING-DOCS
+%ifarch i586
+# Suppress sse flags for 32 bit build.
+Patch0:         buzztrax-fixx86build.patch
+# Set calling mode to void for 32 bit build.
+Patch1:         buzztrax-nolibbml_la-bmlw.patch
+%endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -58,7 +64,6 @@ BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.1.0
 BuildRequires:  pkgconfig(gstreamer-audio-1.0) >= 1.1.0
 BuildRequires:  pkgconfig(gstreamer-base-1.0) >= 1.1.0
 BuildRequires:  pkgconfig(gstreamer-controller-1.0) >= 1.1.0
-#BuildRequires:  pkgconfig(gstreamer-interfaces-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-x11-2.0)
 BuildRequires:  pkgconfig(clutter-gtk-1.0)
@@ -179,9 +184,15 @@ This package contains buzztrax plugins
 
 %prep
 %setup -q
+%ifarch i586
+%patch0
+%patch1
+%endif
 cp -v %{S:1} .
-
+#rm -rf src/lib/dllwrapper
+#rm src/lib/bml/bmlw.c src/lib/bml/BuzzMachineLoader.dll
 %build
+
 %configure --disable-static \
     --disable-schemas-compile \
     --disable-silent-rules \
@@ -190,6 +201,7 @@ cp -v %{S:1} .
     --with-pic \
     --enable-man \
     --disable-dllwrapper
+
 make %{?_smp_flags}
 
 %install