Updated some build files

Author: FrodeSolheim

docs/compiling.md

@@ -21,13 +21,17 @@ Install dependencies for bootstrapping and building FS-UAE:
     libopenal-dev libpng-dev libsdl2-dev libsdl2-ttf-dev libtool libxi-dev \
     libxtst-dev zip zlib1g-dev
 
+FIXME: Add portmidi
+
 ### openSUSE
 
 Install dependencies for bootstrapping and building FS-UAE:
 
     sudo zypper install autoconf automake freetype2-devel gcc gcc-c++ gettext \
     glib2-devel libpng-devel libtool libXi-devel openal-devel SDL2-devel zip
 
+FIXME: Add portmidi
+
 ### Fedora
 
 Install dependencies for running bootstrap:
@@ -38,6 +42,8 @@ Install dependencies for building FS-UAE:
 
     sudo dnf install SDL2-devel glib2-devel libpng-devel gcc gcc-c++ openal-devel libXi-devel zip libmpeg2-devel SDL2_ttf-devel glew-devel zlib-devel freetype-devel hicolor-icon-theme
 
+FIXME: Add portmidi
+
 ### Windows
 
 Install latest msys2-x86_64 from www.msys2.org/ and follow the installation

docs/options/fullscreen_spaces

@@ -0,0 +1,4 @@
+Description: "Use fullscreen spaces (macOS)"
+Default: 0
+Example: 1
+Type: boolean

fsbuild/download.py

@@ -6,7 +6,7 @@
 import sys
 
 
-def verify():
+def verify(archive: str, h, checksum):
     with open(archive, "rb") as f:
         actual_checksum = h(f.read()).hexdigest()
     result = actual_checksum == checksum
@@ -16,7 +16,6 @@ def verify():
         print("Checksum verification failed")
         print("Expected", checksum)
         print("But got:", actual_checksum)
-
     return result
 
 
@@ -36,7 +35,7 @@ def main():
     archive = os.path.join("fsbuild/_sources", archive)
 
     if os.path.exists(archive):
-        if verify():
+        if verify(archive, h, checksum):
             sys.exit(0)
         print("Removing archive", archive)
         os.remove(archive)
@@ -46,7 +45,7 @@ def main():
         print("Failed to download")
         sys.exit(1)
 
-    if not verify():
+    if not verify(archive, h, checksum):
         sys.exit(2)
 
 

fsdeps/env.sh

@@ -1,18 +1,22 @@
 # Intended for sourcing by other shell scripts
 # This file is automatically generated by fs-package
 
-# export FSDEPS_NAME=project-name
-# export FSDEPS_PREFIX=$HOME/.fsdeps/$FSDEPS_NAME
+. ./PACKAGE.FS
+
 export FSDEPS_PREFIX="`pwd`/fsdeps/_prefix"
 
 export CMAKE_PREFIX_PATH=$FSDEPS_PREFIX
 
 export C_INCLUDE_PATH=$FSDEPS_PREFIX/include
 export CPLUS_INCLUDE_PATH=$FSDEPS_PREFIX/include
-export LIBRARY_PATH=$FSDEPS_PREFIX/lib
-export PKG_CONFIG_PATH=$FSDEPS_PREFIX/lib/pkgconfig
+export LIBRARY_PATH=$FSDEPS_PREFIX/lib:$FSDEPS_PREFIX/lib64
+export PKG_CONFIG_PATH=$FSDEPS_PREFIX/lib/pkgconfig:$FSDEPS_PREFIX/lib64/pkgconfig
 
 export PATH=$FSDEPS_PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$FSDEPS_PREFIX/lib:$FSDEPS_PREFIX/lib64
 
+if [ "$PACKAGE_MACOS_VERSION_MIN" != "" ]; then
+export MACOSX_DEPLOYMENT_TARGET=$PACKAGE_MACOS_VERSION_MIN
+else
 export MACOSX_DEPLOYMENT_TARGET=10.9
+fi

fsdeps/fedora

@@ -0,0 +1,22 @@
+# SDL2-devel is not itself needed, but it pulls in other useful dependencies
+# FIXME: Should libdecor be an external dependency? Looks like it only uses
+# the header files (dynamic loading).
+
+sudo dnf install \
+	alsa-lib-devel \
+	autoconf \
+	automake \
+	gcc \
+	gettext \
+	libdecor-devel \
+	libdrm-devel \
+	libgbm-devel \
+	libtool \
+	libXext-devel \
+	libXi-devel \
+	libxkbcommon-devel \
+	meson \
+	patchelf \
+	SDL2-devel \
+	wayland-devel \
+	zip

fsdeps/linux.sh

@@ -7,7 +7,7 @@ set -e
 
 PACKAGE=SDL2-2.0.22
 CHECKSUM=fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e
-REVISION=0
+REVISION=1
 
 . fsdeps/dep.sh
 
@@ -19,6 +19,25 @@ rm -Rf fsdeps/_build && mkdir fsdeps/_build && cd fsdeps/_build
 tar xf ../_sources/$PACKAGE.tar.gz
 cd $PACKAGE
 
+patch -p1 <<EOF
+diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c
+index 8b552bb7dad..c1608a797ae 100644
+--- a/src/joystick/windows/SDL_windows_gaming_input.c
++++ b/src/joystick/windows/SDL_windows_gaming_input.c
+@@ -34,6 +34,11 @@
+ #include <cfgmgr32.h>
+ #include <roapi.h>
+ 
++#ifdef __MINGW32__
++#define __FIReference_1_int __FIReference_1_INT32
++#define __FIReference_1_int_get_Value __FIReference_1_INT32_get_Value
++#define __FIReference_1_int_Release __FIReference_1_INT32_Release
++#endif
+ 
+ struct joystick_hwdata
+ {
+EOF
+
 if [ "`uname`" = "Darwin" ]; then
 python3 ../../replace.py \
 src/video/cocoa/SDL_cocoaevents.m \