Merge pull request #875 from fewtarius/dev

Ubuntu on M1 build fixes.

README.md

@@ -76,5 +76,5 @@ io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [
 * [Developing and Building JELOS](https://github.com/JustEnoughLinuxOS/distribution/blob/dev/BUILDING.md)
 
 ## Credits
-Like any Linux distribution, this project is not the work of one person.  It is the work of many persons all over the world who have developed the open source bits without which this project could not exist.  Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the ARM handheld community.
+Like any Linux distribution, this project is not the work of one person.  It is the work of many persons all over the world who have developed the open source bits without which this project could not exist.  Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the handheld community.
 

packages/games/libretro/dosbox-pure/patches/02-no-strip.patch

@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index 3e7941c..ceb21c3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,6 @@ SOURCES := \
+   src/*/*/*.cpp
+ 
+ CPUFLAGS := $(MAKE_CPUFLAGS)
+-STRIPCMD := strip --strip-all
+ ifneq ($(ISWIN),)
+   OUTNAME := dosbox_pure_libretro.dll
+   CXX     ?= g++
+@@ -58,7 +57,6 @@ else ifneq (,$(findstring ios,$(platform)))
+     MINVERSION = -miphoneos-version-min=5.0
+   endif
+   COMMONFLAGS += $(MINVERSION) -Wno-ignored-optimization-argument -Wno-unknown-warning-option
+-  STRIPCMD := strip -xS
+ else ifeq ($(platform),tvos-arm64)
+   ifeq ($(IOSSDK),)
+     IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
+@@ -67,7 +65,6 @@ else ifeq ($(platform),tvos-arm64)
+   CXX     = c++ -arch arm64 -isysroot $(IOSSDK)
+   LDFLAGS := -Wl,-dead_strip
+   COMMONFLAGS += -DDISABLE_DYNAREC=1 -Wno-unknown-warning-option
+-  STRIPCMD := strip -xS
+ else ifneq ($(ISMAC),)
+   OUTNAME := dosbox_pure_libretro.dylib
+   CXX     ?= c++
+@@ -81,7 +78,6 @@ else ifneq ($(ISMAC),)
+   endif
+   COMMONFLAGS  += $(ARCHFLAGS)
+   LDFLAGS      += $(ARCHFLAGS)
+-  STRIPCMD := strip -xS
+ else ifeq ($(platform),windows) # For MSYS2 only
+   OUTNAME := dosbox_pure_libretro.dll
+   CXX     ?= g++
+@@ -138,7 +134,6 @@ else ifeq ($(platform),gcw0)
+   LDFLAGS := -Wl,--gc-sections -fno-ident
+   CPUFLAGS := -ffast-math -march=mips32r2 -mtune=mips32r2 -mhard-float -fexpensive-optimizations -frename-registers
+   COMMONFLAGS += -pthread
+-  STRIPCMD := /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/bin/strip --strip-all
+ else ifneq ($(findstring Haiku,$(shell uname -s)),)
+   OUTNAME := dosbox_pure_libretro.so
+   LDFLAGS := -Wl,--gc-sections -fno-ident -lroot -lnetwork
+@@ -245,9 +240,6 @@ ifeq ($(STATIC_LINKING), 1)
+ else
+ 	$(info Linking $@ ...)
+ 	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+-ifneq ($(BUILD),DEBUG)
+-	$(STRIPCMD) $@
+-endif
+ endif
+ 
+ define COMPILE

packages/graphics/vulkan/vulkan-loader/package.mk

@@ -24,9 +24,12 @@ pre_configure_target() {
   PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTS=OFF"
 
   # GAS / GNU Assembler is only supported by aarch64 & x86_64
-  if [ "${ARCH}" = "arm" ]; then
-    PKG_CMAKE_OPTS_TARGET+=" -DUSE_GAS=OFF"
-  fi
+  HOST_ARCH=$(uname -m)
+  case ${HOST_ARCH} in
+     arm|aarch64)
+       PKG_CMAKE_OPTS_TARGET+=" -DUSE_GAS=OFF"
+     ;;
+  esac
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=ON \