Merge pull request #159 from Ghabry/fix-xmp

Fix xmplite
EasyRPG · Nov 19, 2023 · 504f3eb · 504f3eb
2 parents cbf6aaf + 2b5699e
commit 504f3eb
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 75 deletions.
diff --git a/shared/CMakeLists_xmplite.txt b/shared/CMakeLists_xmplite.txt
diff --git 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
@@ -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
@@ -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"

diff --git 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 → vita/icu-vita.patch b/vita/icu69-vita.patch → vita/icu-vita.patch