From 465a1ab30d3236a1cbe0cdbba1b6b525e006c410 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 19 Nov 2023 16:42:09 +0100
Subject: [PATCH 1/2] xmplite: Fix newest version

---
 shared/CMakeLists_xmplite.txt | 65 -----------------------------------
 shared/common.sh              |  9 -----
 shared/packages.ini           |  1 +
 shared/packages.sh            |  1 +
 4 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 shared/CMakeLists_xmplite.txt

diff --git a/shared/CMakeLists_xmplite.txt b/shared/CMakeLists_xmplite.txt
deleted file mode 100644
index 01033a20..00000000
--- a/shared/CMakeLists_xmplite.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-project(xmp-lite VERSION 4.5.0 LANGUAGES C)
-
-add_library(xmp-lite
-	include/libxmp-lite/xmp.h
-	src/virtual.c
-	src/format.c
-	src/period.c
-	src/player.c
-	src/read_event.c
-	src/dataio.c
-	src/lfo.c
-	src/scan.c
-	src/control.c
-	src/filter.c
-	src/effects.c
-	src/mixer.c
-	src/mix_all.c
-	src/load_helpers.c
-	src/load.c
-	src/hio.c
-	src/smix.c
-	src/memio.c
-	src/md5.c
-	src/misc.c
-	src/loaders/common.c
-	src/loaders/itsex.c
-	src/loaders/sample.c
-	src/loaders/xm_load.c
-	src/loaders/mod_load.c
-	src/loaders/s3m_load.c
-	src/loaders/it_load.c)
-
-target_include_directories(xmp-lite PUBLIC
-	$<BUILD_INTERFACE:include/libxmp-lite src>
-	$<INSTALL_INTERFACE:include/libxmp-lite>)
-
-target_compile_definitions(xmp-lite PRIVATE
-	LIBXMP_CORE_PLAYER=1
-	LIBXMP_NO_DEPACKERS=1)
-
-# pkg-config
-set(PACKAGE_TARNAME ${PROJECT_NAME})
-set(prefix "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
-set(includedir "\${prefix}/include")
-configure_file(lib${PROJECT_NAME}.pc.in libxmp.pc @ONLY)
-
-# install
-install(
-	TARGETS xmp-lite
-	ARCHIVE DESTINATION lib
-	LIBRARY DESTINATION lib
-	RUNTIME DESTINATION bin)
-
-install(
-	FILES include/libxmp-lite/xmp.h
-	DESTINATION include/libxmp-lite)
-
-install(
-	FILES ${CMAKE_CURRENT_BINARY_DIR}/libxmp.pc
-	DESTINATION lib/pkgconfig
-)
diff --git a/shared/common.sh b/shared/common.sh
index ef95baa2..b63b9e18 100644
--- a/shared/common.sh
+++ b/shared/common.sh
@@ -294,15 +294,6 @@ function patches_common {
 		)
 	fi
 
-	# libxmp-lite
-	if [ -d "$LIBXMP_LITE_DIR" ]; then
-		# compile fix
-		(cd $LIBXMP_LITE_DIR
-			# Use custom CMakeLists.txt
-			cp $_SCRIPT_DIR/CMakeLists_xmplite.txt ./CMakeLists.txt
-		)
-	fi
-
 	# Tremor: Generate configure & Makefile, fix build
 	if [ -d "$TREMOR_DIR" ]; then
 		(cd $TREMOR_DIR
diff --git a/shared/packages.ini b/shared/packages.ini
index c9927972..64ff1b0e 100644
--- a/shared/packages.ini
+++ b/shared/packages.ini
@@ -68,6 +68,7 @@ anitya_id = 13277
 [libxmp-lite]
 version = 4.6.0
 url = "https://github.com/libxmp/libxmp/releases/download/libxmp-${version}/libxmp-lite-${version}.tar.gz"
+arguments = "-DBUILD_STATIC=ON -DBUILD_SHARED=OFF"
 anitya_id = 1784
 
 [speexdsp]
diff --git a/shared/packages.sh b/shared/packages.sh
index c1549109..40d334f1 100644
--- a/shared/packages.sh
+++ b/shared/packages.sh
@@ -45,6 +45,7 @@ LIBSNDFILE_ARGS="--disable-alsa --disable-sqlite --disable-full-suite --disable-
 LIBSNDFILE_DIR="libsndfile-1.2.2"
 
 LIBXMP_LITE_URL="https://github.com/libxmp/libxmp/releases/download/libxmp-4.6.0/libxmp-lite-4.6.0.tar.gz"
+LIBXMP_LITE_ARGS="-DBUILD_STATIC=ON -DBUILD_SHARED=OFF"
 LIBXMP_LITE_DIR="libxmp-lite-4.6.0"
 
 SPEEXDSP_URL="https://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz"

From 2b5699e4fbc0747a03b1961d3653455bdd0c7bcc Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 19 Nov 2023 16:45:01 +0100
Subject: [PATCH 2/2] Vita: Rename icu69 patch to icu

Makes it more clear that we are on the latest version.
---
 vita/2_build_toolchain.sh                 | 2 +-
 vita/{icu69-vita.patch => icu-vita.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename vita/{icu69-vita.patch => icu-vita.patch} (100%)

diff --git a/vita/2_build_toolchain.sh b/vita/2_build_toolchain.sh
index d0008135..f552dc23 100755
--- a/vita/2_build_toolchain.sh
+++ b/vita/2_build_toolchain.sh
@@ -32,7 +32,7 @@ if [ ! -f .patches-applied ]; then
 
 	# Fix icu build
 	cp -rup icu icu-native
-	patch -Np0 < $SCRIPT_DIR/icu69-vita.patch
+	patch -Np0 < $SCRIPT_DIR/icu-vita.patch
 
 	# Disable vita2dlib jpeg dependency
 	patch -Np0 < $SCRIPT_DIR/libvita2d-no-jpeg.patch
diff --git a/vita/icu69-vita.patch b/vita/icu-vita.patch
similarity index 100%
rename from vita/icu69-vita.patch
rename to vita/icu-vita.patch