From b366420d1d870fcca36d720065f7f5ba371fa080 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 9 Oct 2021 19:06:42 +0200
Subject: [PATCH] libretro-opera: update cross build patch

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 .../libretro-opera-995.01-crosscompile.patch  | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/packages/emulation/libretro-opera/patches/libretro-opera-995.01-crosscompile.patch b/packages/emulation/libretro-opera/patches/libretro-opera-995.01-crosscompile.patch
index 65848dbf88..7794cad7cf 100644
--- a/packages/emulation/libretro-opera/patches/libretro-opera-995.01-crosscompile.patch
+++ b/packages/emulation/libretro-opera/patches/libretro-opera-995.01-crosscompile.patch
@@ -1,14 +1,5 @@
-From a845c2c44e2bed070b1f6db5b0fda5a7a84485e6 Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Thu, 18 Feb 2021 13:21:30 +0100
-Subject: [PATCH] Makefile: only define cc, cxx, ar, ld if not predefined
-
----
- Makefile | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
 diff --git a/Makefile b/Makefile
-index f588a3c..27c5461 100644
+index c62fee2..49b0e98 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -49,8 +49,8 @@ unixpath = $(subst \,/,$1)
@@ -33,19 +24,19 @@ index f588a3c..27c5461 100644
  
      TARGET := $(TARGET_NAME)_libretro.so
      fpic := -fPIC
-@@ -180,9 +180,9 @@ ifeq ($(IOSSDK),)
+@@ -181,9 +181,9 @@ ifeq ($(IOSSDK),)
     IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
  endif
  ifeq ($(platform),ios-arm64)
--   CC = cc -arch arm64 -isysroot $(IOSSDK)
-+   CC ?= cc -arch arm64 -isysroot $(IOSSDK)
+-   CC = cc -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
++   CC ?= cc -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
  else
 -   CC = cc -arch armv7 -isysroot $(IOSSDK)
 +   CC ?= cc -arch armv7 -isysroot $(IOSSDK)
  endif
  ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-    SHARED += -miphoneos-version-min=8.0
-@@ -213,18 +213,18 @@ else ifeq ($(platform), qnx)
+    MINVERSION = -miphoneos-version-min=8.0
+@@ -216,18 +216,18 @@ else ifeq ($(platform), qnx)
     TARGET := $(TARGET_NAME)_libretro_$(platform).so
     fpic := -fPIC
     SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
@@ -69,7 +60,7 @@ index f588a3c..27c5461 100644
     STATIC_LINKING = 1
     FLAGS += -DMSB_FIRST
     NO_GCC = 1
-@@ -232,25 +232,25 @@ else ifeq ($(platform), sncps3)
+@@ -235,25 +235,25 @@ else ifeq ($(platform), sncps3)
  # PSP1
  else ifeq ($(platform), psp1)
     TARGET := $(TARGET_NAME)_libretro_$(platform).a
@@ -102,7 +93,7 @@ index f588a3c..27c5461 100644
     FLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard
     FLAGS += -Wall -mword-relocations
     FLAGS += -fomit-frame-pointer -ffast-math
-@@ -308,8 +308,8 @@ else ifeq ($(platform), emscripten)
+@@ -311,8 +311,8 @@ else ifeq ($(platform), emscripten)
  # Windows MSVC 2003 Xbox 1
  else ifeq ($(platform), xbox1_msvc2003)
  TARGET := $(TARGET_NAME)_libretro_xdk1.lib
@@ -113,7 +104,7 @@ index f588a3c..27c5461 100644
  
  export INCLUDE := $(XDK)/xbox/include
  export LIB := $(XDK)/xbox/lib
-@@ -322,8 +322,8 @@ HAS_GCC := 0
+@@ -325,8 +325,8 @@ HAS_GCC := 0
  else ifeq ($(platform), xbox360_msvc2010)
  TARGET := $(TARGET_NAME)_libretro_xdk360.lib
  MSVCBINDIRPREFIX = $(XEDK)/bin/win32
@@ -124,7 +115,7 @@ index f588a3c..27c5461 100644
  
  export INCLUDE := $(XEDK)/include/xbox
  export LIB := $(XEDK)/lib/xbox
-@@ -456,9 +456,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
+@@ -461,9 +461,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
  
  	TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
  
@@ -137,7 +128,7 @@ index f588a3c..27c5461 100644
  
  	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
  	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
-@@ -612,7 +612,7 @@ ifeq ($(STATIC_LINKING),1)
+@@ -617,7 +617,7 @@ ifeq ($(STATIC_LINKING),1)
  	LD ?= lib.exe
  	STATIC_LINKING=0
  else