From: notaz <notasas@gmail.com>
Date: Mon, 20 May 2024 22:58:19 +0000 (+0300)
Subject: libretro: update build for newer libchdr
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7039d477203406f3830415b202ac1f961d9a638;p=pcsx_rearmed.git

libretro: update build for newer libchdr
---

diff --git a/Makefile b/Makefile
index fd26de14..dade5ca6 100644
--- a/Makefile
+++ b/Makefile
@@ -255,8 +255,8 @@ OBJS += plugins/cdrcimg/cdrcimg.o
 # libchdr
 ifeq "$(HAVE_CHD)" "1"
 LCHDR = deps/libchdr
-LCHDR_LZMA = $(LCHDR)/deps/lzma-22.01
-LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.5/lib
+LCHDR_LZMA = $(LCHDR)/deps/lzma-24.05
+LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.6/lib
 OBJS += $(LCHDR)/src/libchdr_bitstream.o
 OBJS += $(LCHDR)/src/libchdr_cdrom.o
 OBJS += $(LCHDR)/src/libchdr_chd.o
@@ -264,31 +264,26 @@ OBJS += $(LCHDR)/src/libchdr_flac.o
 OBJS += $(LCHDR)/src/libchdr_huffman.o
 $(LCHDR)/src/%.o: CFLAGS += -Wno-unused -std=gnu11
 OBJS += $(LCHDR_LZMA)/src/Alloc.o
-OBJS += $(LCHDR_LZMA)/src/Bra86.o
-OBJS += $(LCHDR_LZMA)/src/BraIA64.o
 OBJS += $(LCHDR_LZMA)/src/CpuArch.o
 OBJS += $(LCHDR_LZMA)/src/Delta.o
 OBJS += $(LCHDR_LZMA)/src/LzFind.o
-OBJS += $(LCHDR_LZMA)/src/Lzma86Dec.o
 OBJS += $(LCHDR_LZMA)/src/LzmaDec.o
 OBJS += $(LCHDR_LZMA)/src/LzmaEnc.o
 OBJS += $(LCHDR_LZMA)/src/Sort.o
-$(LCHDR_LZMA)/src/%.o: CFLAGS += -Wno-unused -D_7ZIP_ST -I$(LCHDR_LZMA)/include
+$(LCHDR_LZMA)/src/%.o: CFLAGS += -Wno-unused -DZ7_ST -I$(LCHDR_LZMA)/include
 $(LCHDR)/src/%.o: CFLAGS += -I$(LCHDR_LZMA)/include
-OBJS += $(LCHDR_ZSTD)/common/debug.o
 OBJS += $(LCHDR_ZSTD)/common/entropy_common.o
 OBJS += $(LCHDR_ZSTD)/common/error_private.o
 OBJS += $(LCHDR_ZSTD)/common/fse_decompress.o
-OBJS += $(LCHDR_ZSTD)/common/pool.o
-OBJS += $(LCHDR_ZSTD)/common/threading.o
 OBJS += $(LCHDR_ZSTD)/common/xxhash.o
 OBJS += $(LCHDR_ZSTD)/common/zstd_common.o
 OBJS += $(LCHDR_ZSTD)/decompress/huf_decompress.o
+OBJS += $(LCHDR_ZSTD)/decompress/huf_decompress_amd64.o
 OBJS += $(LCHDR_ZSTD)/decompress/zstd_ddict.o
 OBJS += $(LCHDR_ZSTD)/decompress/zstd_decompress_block.o
 OBJS += $(LCHDR_ZSTD)/decompress/zstd_decompress.o
 $(LCHDR_ZSTD)/common/%.o \
-$(LCHDR_ZSTD)/decompress/%.o: CFLAGS += -DZSTD_DISABLE_ASM -I$(LCHDR_ZSTD)
+$(LCHDR_ZSTD)/decompress/%.o: CFLAGS += -I$(LCHDR_ZSTD)
 $(LCHDR)/src/%.o: CFLAGS += -I$(LCHDR_ZSTD)
 libpcsxcore/cdriso.o: CFLAGS += -Wno-unused-function
 CFLAGS += -DHAVE_CHD -I$(LCHDR)/include
diff --git a/jni/Android.mk b/jni/Android.mk
index a858d3b6..1b6f1dd6 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -69,8 +69,8 @@ SOURCES_C += $(FRONTEND_DIR)/main.c \
 
 # libchdr
 LCHDR = $(DEPS_DIR)/libchdr
-LCHDR_LZMA = $(LCHDR)/deps/lzma-22.01
-LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.5/lib
+LCHDR_LZMA = $(LCHDR)/deps/lzma-24.05
+LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.6/lib
 SOURCES_C += \
 	     $(LCHDR)/src/libchdr_bitstream.c \
 	     $(LCHDR)/src/libchdr_cdrom.c \
@@ -78,21 +78,15 @@ SOURCES_C += \
 	     $(LCHDR)/src/libchdr_flac.c \
 	     $(LCHDR)/src/libchdr_huffman.c \
 	     $(LCHDR_LZMA)/src/Alloc.c \
-	     $(LCHDR_LZMA)/src/Bra86.c \
-	     $(LCHDR_LZMA)/src/BraIA64.c \
 	     $(LCHDR_LZMA)/src/CpuArch.c \
 	     $(LCHDR_LZMA)/src/Delta.c \
 	     $(LCHDR_LZMA)/src/LzFind.c \
-	     $(LCHDR_LZMA)/src/Lzma86Dec.c \
 	     $(LCHDR_LZMA)/src/LzmaDec.c \
 	     $(LCHDR_LZMA)/src/LzmaEnc.c \
 	     $(LCHDR_LZMA)/src/Sort.c \
-	     $(LCHDR_ZSTD)/common/debug.c \
 	     $(LCHDR_ZSTD)/common/entropy_common.c \
 	     $(LCHDR_ZSTD)/common/error_private.c \
 	     $(LCHDR_ZSTD)/common/fse_decompress.c \
-	     $(LCHDR_ZSTD)/common/pool.c \
-	     $(LCHDR_ZSTD)/common/threading.c \
 	     $(LCHDR_ZSTD)/common/xxhash.c \
 	     $(LCHDR_ZSTD)/common/zstd_common.c \
 	     $(LCHDR_ZSTD)/decompress/huf_decompress.c \
@@ -101,7 +95,10 @@ SOURCES_C += \
 	     $(LCHDR_ZSTD)/decompress/zstd_decompress.c
 SOURCES_ASM :=
 EXTRA_INCLUDES += $(LCHDR)/include $(LCHDR_LZMA)/include $(LCHDR_ZSTD)
-COREFLAGS += -DHAVE_CHD -D_7ZIP_ST -DZSTD_DISABLE_ASM
+COREFLAGS += -DHAVE_CHD -DZ7_ST -DZSTD_DISABLE_ASM
+ifeq (,$(call gte,$(APP_PLATFORM_LEVEL),18))
+COREFLAGS += -Dgetauxval=0*
+endif
 
 COREFLAGS += -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
 COREFLAGS += -DP_HAVE_MMAP=1 -DP_HAVE_PTHREAD=1 -DP_HAVE_POSIX_MEMALIGN=1