From 9c9b3810fdc8c6a0f77054651a7953f97b3911a3 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 1 Nov 2020 07:41:33 +0100 Subject: [PATCH] libretro-bsnes: fix for latest update --- .../package.mk | 4 +- ...cury-accuracy-0001_fix-cross-compile.patch | 50 ++++--------------- .../package.mk | 4 +- ...cury-balanced-0001_fix-cross-compile.patch | 50 ++++--------------- .../package.mk | 4 +- ...y-performance-0001_fix-cross-compile.patch | 50 ++++--------------- 6 files changed, 33 insertions(+), 129 deletions(-) diff --git a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk index a72dec9bf3..e6c09c4151 100644 --- a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk @@ -11,11 +11,11 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-accuracy: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_accuracy_libretro.so" -PKG_LIBPATH="out/$PKG_LIBNAME" +PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="BSNES-MERCURY-ACCURACY_LIB" make_target() { - make profile=accuracy + make PROFILE=accuracy } makeinstall_target() { diff --git a/packages/emulation/libretro-bsnes-mercury-accuracy/patches/libretro-bsnes-mercury-accuracy-0001_fix-cross-compile.patch b/packages/emulation/libretro-bsnes-mercury-accuracy/patches/libretro-bsnes-mercury-accuracy-0001_fix-cross-compile.patch index a7b59a12a4..a657f499c0 100644 --- a/packages/emulation/libretro-bsnes-mercury-accuracy/patches/libretro-bsnes-mercury-accuracy-0001_fix-cross-compile.patch +++ b/packages/emulation/libretro-bsnes-mercury-accuracy/patches/libretro-bsnes-mercury-accuracy-0001_fix-cross-compile.patch @@ -1,35 +1,3 @@ -From ed19aa8fbd4012ea2ccb74a2160855be01aba5e4 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -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 - --ifeq ($(compiler),) -- ifneq ($(CXX),) -- compiler := $(CXX) -- else -- compiler := g++ -- endif --endif -+compiler = $(CXX) - - # platform - ui := target-$(target) --- -2.9.3 - - From da71b9ec79482c31c37496019792da316626f1f2 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 5 Feb 2017 20:40:42 -0800 @@ -40,18 +8,18 @@ Subject: [PATCH 2/2] no -O3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index b76c4c6..9622b5a 100644 +index 948f5fb..04e585d 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 +@@ -459,7 +459,7 @@ OBJECTS := $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o) + all: $(TARGET) - cflags := $(CPPFLAGS) $(CFLAGS) -std=gnu99 -xc + ifeq ($(DEBUG),0) +- FLAGS += -O3 $(EXTRA_GCC_FLAGS) ++ FLAGS += $(EXTRA_GCC_FLAGS) + else + FLAGS += -O0 -g + endif -- 2.9.3 diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk index 6706882abc..a631901994 100644 --- a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk @@ -11,11 +11,11 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-balanced: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_balanced_libretro.so" -PKG_LIBPATH="out/$PKG_LIBNAME" +PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="BSNES-MERCURY-BALANCED_LIB" make_target() { - make profile=balanced + make PROFILE=balanced } makeinstall_target() { 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 a7b59a12a4..a657f499c0 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,35 +1,3 @@ -From ed19aa8fbd4012ea2ccb74a2160855be01aba5e4 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -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 - --ifeq ($(compiler),) -- ifneq ($(CXX),) -- compiler := $(CXX) -- else -- compiler := g++ -- endif --endif -+compiler = $(CXX) - - # platform - ui := target-$(target) --- -2.9.3 - - From da71b9ec79482c31c37496019792da316626f1f2 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 5 Feb 2017 20:40:42 -0800 @@ -40,18 +8,18 @@ Subject: [PATCH 2/2] no -O3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index b76c4c6..9622b5a 100644 +index 948f5fb..04e585d 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 +@@ -459,7 +459,7 @@ OBJECTS := $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o) + all: $(TARGET) - cflags := $(CPPFLAGS) $(CFLAGS) -std=gnu99 -xc + ifeq ($(DEBUG),0) +- FLAGS += -O3 $(EXTRA_GCC_FLAGS) ++ FLAGS += $(EXTRA_GCC_FLAGS) + else + FLAGS += -O0 -g + endif -- 2.9.3 diff --git a/packages/emulation/libretro-bsnes-mercury-performance/package.mk b/packages/emulation/libretro-bsnes-mercury-performance/package.mk index ed94724bf3..3885eeb487 100644 --- a/packages/emulation/libretro-bsnes-mercury-performance/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-performance/package.mk @@ -11,11 +11,11 @@ PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-performance: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_performance_libretro.so" -PKG_LIBPATH="out/$PKG_LIBNAME" +PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="BSNES-MERCURY-PERFORMANCE_LIB" make_target() { - make profile=performance + make PROFILE=performance } makeinstall_target() { diff --git a/packages/emulation/libretro-bsnes-mercury-performance/patches/libretro-bsnes-mercury-performance-0001_fix-cross-compile.patch b/packages/emulation/libretro-bsnes-mercury-performance/patches/libretro-bsnes-mercury-performance-0001_fix-cross-compile.patch index a7b59a12a4..a657f499c0 100644 --- a/packages/emulation/libretro-bsnes-mercury-performance/patches/libretro-bsnes-mercury-performance-0001_fix-cross-compile.patch +++ b/packages/emulation/libretro-bsnes-mercury-performance/patches/libretro-bsnes-mercury-performance-0001_fix-cross-compile.patch @@ -1,35 +1,3 @@ -From ed19aa8fbd4012ea2ccb74a2160855be01aba5e4 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -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 - --ifeq ($(compiler),) -- ifneq ($(CXX),) -- compiler := $(CXX) -- else -- compiler := g++ -- endif --endif -+compiler = $(CXX) - - # platform - ui := target-$(target) --- -2.9.3 - - From da71b9ec79482c31c37496019792da316626f1f2 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 5 Feb 2017 20:40:42 -0800 @@ -40,18 +8,18 @@ Subject: [PATCH 2/2] no -O3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index b76c4c6..9622b5a 100644 +index 948f5fb..04e585d 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 +@@ -459,7 +459,7 @@ OBJECTS := $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o) + all: $(TARGET) - cflags := $(CPPFLAGS) $(CFLAGS) -std=gnu99 -xc + ifeq ($(DEBUG),0) +- FLAGS += -O3 $(EXTRA_GCC_FLAGS) ++ FLAGS += $(EXTRA_GCC_FLAGS) + else + FLAGS += -O0 -g + endif -- 2.9.3