USMR

# zou-flow - 8.3.0.2410 net8.0

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "planetblupi-data"]
 	path = planetblupi-data
 	url = ../planetblupi-data.git
-[submodule "planetblupi-www"]
-	path = planetblupi-www
-	url = ../planetblupi-www.git

CMakeLists.txt

@@ -33,7 +33,7 @@ if (BUILD_DARWIN)
   set (CMD_LDFLAGS "-L${CMAKE_BINARY_DIR}/lib -framework AudioToolBox -framework AudioUnit -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon")
 
   if (OLD_SDK)
-    set (OSX_SDK_VERSION 10.9)
+    set (OSX_SDK_VERSION 10.13)
     set (CMAKE_OSX_DEPLOYMENT_TARGET ${OSX_SDK_VERSION})
     set (CMD_CXXFLAGS "-mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_CXX_FLAGS}")
     set (CMD_CFLAGS "-mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_C_FLAGS}")
@@ -74,12 +74,12 @@ set (ARGAGG_VER 0.4.6)
 DLEXT (https://github.com/vietjtnguyen/argagg/archive/${ARGAGG_VER}.tar.gz argagg-${ARGAGG_VER}.tar.gz)
 
 set (HAS_FFMPEG ON)
-set (FFMPEG_VER 4.1.1)
+set (FFMPEG_VER 5.1.4)
 DLEXT (http://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VER}.tar.xz ffmpeg-${FFMPEG_VER}.tar.xz)
 
 if (NOT BUILD_JS)
   set (HAS_SDLMIXER ON)
-  set (SDLMIXER_VER 2.6.2)
+  set (SDLMIXER_VER 2.6.3)
   DLEXT (https://github.com/libsdl-org/SDL_mixer/releases/download/release-${SDLMIXER_VER}/SDL2_mixer-${SDLMIXER_VER}.tar.gz SDL2_mixer-${SDLMIXER_VER}.tar.gz)
 
   set (HAS_ZLIB ON)
@@ -103,15 +103,15 @@ if (NOT BUILD_JS)
   DLEXT (http://downloads.xiph.org/releases/ogg/libogg-${OGG_VER}.tar.xz libogg-${OGG_VER}.tar.xz)
 
   set (HAS_VORBIS ON)
-  set (VORBIS_VER 1.3.6)
+  set (VORBIS_VER 1.3.7)
   DLEXT (http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VER}.tar.xz libvorbis-${VORBIS_VER}.tar.xz)
 
   set (HAS_SDL ON)
-  set (SDL_VER 2.26.1)
+  set (SDL_VER 2.28.5)
   DLEXT (https://www.libsdl.org/release/SDL2-${SDL_VER}.tar.gz SDL2-${SDL_VER}.tar.bz2)
 
   set (HAS_SDLIMAGE ON)
-  set (SDLIMAGE_VER 2.6.2)
+  set (SDLIMAGE_VER 2.6.3)
   DLEXT (https://github.com/libsdl-org/SDL_image/releases/download/release-${SDLIMAGE_VER}/SDL2_image-${SDLIMAGE_VER}.tar.gz SDL2_image-${SDLIMAGE_VER}.tar.gz)
 
   set (HAS_SDLTTF ON)
@@ -408,7 +408,6 @@ if (HAS_FFMPEG)
       --enable-demuxer=matroska
       --enable-protocol=file
       --disable-crystalhd
-      --disable-xvmc
       --disable-vaapi
       --disable-videotoolbox
       --disable-vdpau
@@ -483,6 +482,7 @@ endif ()
 if (HAS_VORBIS)
   ExternalProject_Add (libvorbis_Project
     URL ${CMAKE_CURRENT_SOURCE_DIR}/externals/libvorbis-${VORBIS_VER}.tar.xz
+    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/externals/patches/libvorbis-${VORBIS_VER}.patch
     PREFIX ${CMAKE_BINARY_DIR}
     CONFIGURE_COMMAND ${CMD} ./configure
       --prefix=${CMAKE_BINARY_DIR}
@@ -787,7 +787,8 @@ if (HAS_KITCHENSINK)
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/SDL_kitchensink
     PREFIX ${CMAKE_BINARY_DIR}
     CMAKE_COMMAND ${CMD} cmake
-    CMAKE_ARGS -DDISABLE_SHARED=true
+    CMAKE_ARGS -DBUILD_SHARED=false
+               -DBUILD_STATIC=true
                -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                ${KITCHENSINK_CMAKE}
@@ -809,7 +810,7 @@ if (BUILD_LINUX AND NOT DISABLE_APPIMAGE)
   set (APPIMAGE_APPRUN_PROGRAM "${CMAKE_CURRENT_SOURCE_DIR}/externals/${APPIMAGE_APPRUN_BIN}")
 
   set (APPIMAGE_TOOL_BIN     "appimagetool-x86_64.AppImage")
-  set (APPIMAGE_TOOL_URL     "https://github.com/probonopd/AppImageKit/releases/download/continuous/${APPIMAGE_TOOL_BIN}")
+  set (APPIMAGE_TOOL_URL     "https://github.com/AppImage/appimagetool/releases/download/continuous/${APPIMAGE_TOOL_BIN}")
   set (APPIMAGE_TOOL_PROGRAM "${CMAKE_CURRENT_SOURCE_DIR}/externals/${APPIMAGE_TOOL_BIN}")
 
   if (NOT EXISTS "${APPIMAGE_APPRUN_PROGRAM}")
@@ -851,5 +852,5 @@ add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
 set (CPACK_SOURCE_GENERATOR "TXZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "planetblupi-dev")
-set (CPACK_SOURCE_IGNORE_FILES "/build/;/Debug/;/Release/;/planetblupi-data/;/planetblupi-www/;/.git/;.git;.directory;~$;${CPACK_SOURCE_IGNORE_FILES}")
+set (CPACK_SOURCE_IGNORE_FILES "/build/;/Debug/;/Release/;/planetblupi-data/;/.git/;.git;.directory;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)

README.md

@@ -49,7 +49,6 @@ submodules.
 
 - **source-code**: `planetblupi/`
 - **source-assets**: `planetblupi-data/`
-- **website**: `planetblupi-www/` (see <https://www.blupi.org>)
 
 ### Linux
 

SDL_kitchensink

@@ -1 +1 @@
-Subproject commit 616a3b439bde626f26726e2484713e6c9a475dcb
+Subproject commit 50eb03ec82497edbffe2a0a534324b3fcb5ed695

externals/patches/libvorbis-1.3.7.patch

@@ -0,0 +1,15 @@
+--- a/configure	2020-07-04 08:20:13
++++ b/configure	2023-11-08 22:26:15
+@@ -12840,9 +12840,9 @@
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ 		PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+ 	*-*-darwin*)
+-		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
++		DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
++		CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
++		PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
+ 	*-*-os2*)
+ 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"

planetblupi

@@ -1 +1 @@
-Subproject commit 36ace496f1cd88cf336594aaf82cb4ff93c0c640
+Subproject commit 01ea0c1941a41a2ffd33daa52ef8429a24a01ff5

planetblupi-data

@@ -1 +1 @@
-Subproject commit 8a9250b8dfc89472503b249d142c66cb00f67d3c
+Subproject commit 8773d6f9fa5d690b1a0c34c20c7dea79e4c0d822

planetblupi-www

@@ -1 +0,0 @@
-Subproject commit 4eb800faef546c6362797b21722306091cc9ff4b