From f0ddc4fe0df15321ce64be990ccd29ac2e772014 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 5 Feb 2017 22:05:09 -0800
Subject: [PATCH] libretro-bsnes-mercury-balanced: update to 9061b90 and
 cleanup

---
 .../package.mk                                | 11 ++--
 ...cury-balanced-0001_fix-cross-compile.patch | 58 ++++++++++++++-----
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
index 732f1ee84d..2311e55e31 100644
--- a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
+++ b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libretro-bsnes-mercury-balanced"
-PKG_VERSION="425015a"
+PKG_VERSION="9061b90"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
@@ -29,18 +29,19 @@ PKG_SHORTDESC="game.libretro.beetle-bsnes-balanced: Beetle bSNES for Kodi"
 PKG_LONGDESC="game.libretro.beetle-bsnes-balanced: Beetle bSNES for Kodi"
 PKG_AUTORECONF="no"
 PKG_IS_ADDON="no"
+PKG_USE_CMAKE="no"
 
 PKG_LIBNAME="bsnes_mercury_balanced_libretro.so"
 PKG_LIBPATH="out/$PKG_LIBNAME"
-PKG_LIBVAR="BSNES_MERCURY_LIB"
+PKG_LIBVAR="BSNES-MERCURY-BALANCED_LIB"
 
 make_target() {
   make profile=balanced
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-  cp $PKG_LIBPATH $INSTALL/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $INSTALL/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/$PKG_NAME-config.cmake
+  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
+  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
+  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
 }
 
diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/patches/libretro-bsnes-mercury-balanced-0001_fix-cross-compile.patch b/packages/emulation/libretro-bsnes-mercury-balanced/patches/libretro-bsnes-mercury-balanced-0001_fix-cross-compile.patch
index 723c948270..a7b59a12a4 100644
--- a/packages/emulation/libretro-bsnes-mercury-balanced/patches/libretro-bsnes-mercury-balanced-0001_fix-cross-compile.patch
+++ b/packages/emulation/libretro-bsnes-mercury-balanced/patches/libretro-bsnes-mercury-balanced-0001_fix-cross-compile.patch
@@ -1,18 +1,17 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2016-01-05 20:14:14.000000000 +0100
-+++ b/Makefile	2016-01-11 20:38:29.377951179 +0100
-@@ -32,8 +32,8 @@
-   flags := -I. -O3 -fomit-frame-pointer
- endif
- 
--cflags := -std=gnu99 -xc
--cppflags := -std=gnu++0x
-+cflags := $(CFLAGS) -std=gnu99 -xc
-+cppflags := $(CXXFLAGS) -std=gnu++0x
- 
- objects := libco
- 
-@@ -48,13 +48,7 @@
+From ed19aa8fbd4012ea2ccb74a2160855be01aba5e4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Sun, 5 Feb 2017 18:15:12 -0800
+Subject: [PATCH 1/2] fix cross compile
+
+---
+ Makefile | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0ac8061..b76c4c6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,13 +51,7 @@ else ifeq ($(pgo),optimize)
    flags += -fprofile-use
  endif
  
@@ -27,3 +26,32 @@ diff -Naur a/Makefile b/Makefile
  
  # platform
  ui := target-$(target)
+-- 
+2.9.3
+
+
+From da71b9ec79482c31c37496019792da316626f1f2 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Sun, 5 Feb 2017 20:40:42 -0800
+Subject: [PATCH 2/2] no -O3
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b76c4c6..9622b5a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,7 @@ sfc_lagfix := 1
+ ifeq ($(DEBUG), 1)
+   flags := -I. -O0 -g
+ else
+-  flags := -I. -O3 -fomit-frame-pointer
++  flags := -I. -fomit-frame-pointer
+ endif
+ 
+ cflags := $(CPPFLAGS) $(CFLAGS) -std=gnu99 -xc
+-- 
+2.9.3
+