Mupen64Plus: fix build for secondary arch

games-emulation/mupen64plus/mupen64plus-2.5.9.recipe

@@ -11,7 +11,7 @@ LICENSE="GNU GPL v2
 	GNU LGPL v2.1
 	BSD (3-clause)
 	"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/mupen64plus/mupen64plus-core/releases/download/$portVersion/mupen64plus-bundle-src-$portVersion.tar.gz"
 CHECKSUM_SHA256="d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8"
 SOURCE_DIR="mupen64plus-bundle-src-$portVersion"

games-emulation/mupen64plus/patches/mupen64plus-2.5.9.patchset

@@ -1,13 +1,13 @@
-From 53d85e77afe4f9d92207d63ba5ae434a72ca06f1 Mon Sep 17 00:00:00 2001
+From 3d79866f25029f05d5c9f98d9355e696b7dac36e Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 15 May 2020 20:50:20 +1000
+Date: Fri, 15 May 2020 22:41:51 +1000
 Subject: Add Haiku suppport
 
 
 diff --git a/source/mupen64plus-audio-sdl/projects/unix/Makefile b/source/mupen64plus-audio-sdl/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 9a98687..70fe253
+index 9a98687..850a066
 --- a/source/mupen64plus-audio-sdl/projects/unix/Makefile
 +++ b/source/mupen64plus-audio-sdl/projects/unix/Makefile
 @@ -24,6 +24,11 @@
@@ -22,10 +22,19 @@ index 9a98687..70fe253
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
    SHARED = -shared
+@@ -84,7 +89,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 diff --git a/source/mupen64plus-core/projects/unix/Makefile b/source/mupen64plus-core/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index c18596b..a57390d
+index c18596b..e1852d8
 --- a/source/mupen64plus-core/projects/unix/Makefile
 +++ b/source/mupen64plus-core/projects/unix/Makefile
 @@ -25,6 +25,9 @@
@@ -38,6 +47,15 @@ index c18596b..a57390d
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
  endif
+@@ -68,7 +71,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 @@ -134,7 +137,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
@@ -211,7 +229,7 @@ index bac1325..8015acd 100644
 diff --git a/source/mupen64plus-input-sdl/projects/unix/Makefile b/source/mupen64plus-input-sdl/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 91ba331..5cda0e8
+index 91ba331..5e75c33
 --- a/source/mupen64plus-input-sdl/projects/unix/Makefile
 +++ b/source/mupen64plus-input-sdl/projects/unix/Makefile
 @@ -23,6 +23,11 @@
@@ -226,6 +244,15 @@ index 91ba331..5cda0e8
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
    SO_EXTENSION = so
+@@ -81,7 +86,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 @@ -91,7 +96,7 @@ ifeq ("$(CPU)","OTHER")
  endif
  
@@ -238,7 +265,7 @@ index 91ba331..5cda0e8
 diff --git a/source/mupen64plus-rsp-hle/projects/unix/Makefile b/source/mupen64plus-rsp-hle/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 57e0580..0de8dbe
+index 57e0580..14bc028
 --- a/source/mupen64plus-rsp-hle/projects/unix/Makefile
 +++ b/source/mupen64plus-rsp-hle/projects/unix/Makefile
 @@ -24,6 +24,11 @@
@@ -253,6 +280,15 @@ index 57e0580..0de8dbe
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
    SO_EXTENSION = so
+@@ -83,7 +88,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 @@ -128,7 +133,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
@@ -265,7 +301,7 @@ index 57e0580..0de8dbe
 diff --git a/source/mupen64plus-ui-console/projects/unix/Makefile b/source/mupen64plus-ui-console/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 42f11a9..3c3e83b
+index 42f11a9..5687b09
 --- a/source/mupen64plus-ui-console/projects/unix/Makefile
 +++ b/source/mupen64plus-ui-console/projects/unix/Makefile
 @@ -23,6 +23,9 @@
@@ -278,7 +314,14 @@ index 42f11a9..3c3e83b
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
  endif
-@@ -68,7 +71,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
+@@ -62,13 +65,13 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     ARCH_DETECTED := 64BITS
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
  endif
  
  # base CFLAGS, LDLIBS, and LDFLAGS
@@ -321,7 +364,7 @@ index 42f11a9..3c3e83b
 diff --git a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 18d6fba..6054a4e
+index 18d6fba..bee5176
 --- a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
 +++ b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
 @@ -25,6 +25,11 @@
@@ -336,6 +379,15 @@ index 18d6fba..6054a4e
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
    SO_EXTENSION = so
+@@ -86,7 +91,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 diff --git a/source/mupen64plus-video-glide64mk2/src/Glitch64/inc/glidesys.h b/source/mupen64plus-video-glide64mk2/src/Glitch64/inc/glidesys.h
 index 12d0fcb..dd98be5 100644
 --- a/source/mupen64plus-video-glide64mk2/src/Glitch64/inc/glidesys.h
@@ -352,7 +404,7 @@ index 12d0fcb..dd98be5 100644
 diff --git a/source/mupen64plus-video-rice/projects/unix/Makefile b/source/mupen64plus-video-rice/projects/unix/Makefile
 old mode 100755
 new mode 100644
-index 7601a80..5035e17
+index 7601a80..39e081a
 --- a/source/mupen64plus-video-rice/projects/unix/Makefile
 +++ b/source/mupen64plus-video-rice/projects/unix/Makefile
 @@ -24,6 +24,11 @@
@@ -367,6 +419,15 @@ index 7601a80..5035e17
  ifeq ("$(UNAME)","Linux")
    OS = LINUX
    SO_EXTENSION = so
+@@ -83,7 +88,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+     PIC ?= 1
+   endif
+ endif
+-ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
++ifneq ("$(filter BePC pentium i%86,$(HOST_CPU))","")
+   CPU := X86
+   ARCH_DETECTED := 32BITS
+   PIC ?= 0
 @@ -118,7 +123,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
@@ -377,7 +438,7 @@ index 7601a80..5035e17
  CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
  CXXFLAGS += -fvisibility-inlines-hidden
 diff --git a/source/mupen64plus-video-rice/src/OGLGraphicsContext.cpp b/source/mupen64plus-video-rice/src/OGLGraphicsContext.cpp
-index e4e57ba..2336bb4 100644
+index e4e57ba..b8a8ee3 100644
 --- a/source/mupen64plus-video-rice/src/OGLGraphicsContext.cpp
 +++ b/source/mupen64plus-video-rice/src/OGLGraphicsContext.cpp
 @@ -100,6 +100,14 @@ bool COGLGraphicsContext::Initialize(uint32 dwWidth, uint32 dwHeight, BOOL bWind
@@ -395,9 +456,9 @@ index e4e57ba..2336bb4 100644
      if (CoreVideo_SetVideoMode(windowSetting.uDisplayWidth, windowSetting.uDisplayHeight, colorBufferDepth, ScreenMode, flags) != M64ERR_SUCCESS)
      {
          DebugMessage(M64MSG_ERROR, "Failed to set %i-bit video mode: %ix%i", colorBufferDepth, (int)windowSetting.uDisplayWidth, (int)windowSetting.uDisplayHeight);
-@@ -208,12 +216,12 @@ bool COGLGraphicsContext::ResizeInitialize(uint32 dwWidth, uint32 dwHeight, BOOL
+@@ -153,12 +161,12 @@ bool COGLGraphicsContext::Initialize(uint32 dwWidth, uint32 dwHeight, BOOL bWind
+     InitOGLExtension();
  
-     InitState();
      Unlock();
 -
 +#ifndef __HAIKU__
@@ -407,6 +468,15 @@ index e4e57ba..2336bb4 100644
      UpdateFrame();
 -
 +#endif
+     m_bReady = true;
+ 
+     return true;
+@@ -213,7 +221,7 @@ bool COGLGraphicsContext::ResizeInitialize(uint32 dwWidth, uint32 dwHeight, BOOL
+     UpdateFrame();
+     Clear(CLEAR_COLOR_AND_DEPTH_BUFFER);
+     UpdateFrame();
+-    
++
      return true;
  }