testing/libretro-neocd: upgrade to 0_git20220325

testing/libretro-neocd/APKBUILD

@@ -1,27 +1,29 @@
 # Contributor: David Demelier <markand@malikania.fr>
 # Maintainer: David Demelier <markand@malikania.fr>
 pkgname=libretro-neocd
-pkgver=0_git20210425
+pkgver=0_git20220325
 pkgrel=0
-_commit="fc85ed4f5e3d075945493a3ae103df53b63cb340"
+_commit="327aeceecdf71c8a0c0af3d6dc53686c94fe44ad"
 pkgdesc="libretro core for neocd"
 url="https://github.com/libretro/neocd_libretro"
 arch="all"
 license="LGPL-3.0-only"
-makedepends="minizip-dev libogg-dev libvorbis-dev libzip-dev zlib-dev"
+makedepends="minizip-dev libogg-dev libvorbis-dev zlib-dev"
 source="$pkgname-$_commit.tar.gz::https://github.com/libretro/neocd_libretro/archive/$_commit.tar.gz
-	patch-unbundle.patch
-	"
+	patch-unbundle.patch"
 builddir="$srcdir/neocd_libretro-$_commit"
 options="!check" # No tests
 
 build() {
-	make
+	rm -rf deps/libogg deps/libvorbis deps/libchdr/deps/zlib*
+	make -j1
 }
 
 package() {
 	install -Dm644 neocd_libretro.so "$pkgdir"/usr/lib/libretro/neocd_libretro.so
 }
 
-sha512sums="4926eaa70ee44b6cb88a5067fa72033490b913b9fe73d8c70d4a9d4d7295aaa6e2684e029612ce2f6a23f446e9b5dea8b42b7652c5645252234ea91d3de0e68e  libretro-neocd-fc85ed4f5e3d075945493a3ae103df53b63cb340.tar.gz
-eb5da7c40145f4b148ec7b77ff3be301dd17068d20b9a688194c311bd81fbbd548e38cd5634ea27d591498c2c4e67d6599d2b8c2f428a1d56066802f493ed1b9  patch-unbundle.patch"
+sha512sums="
+12c4a848aac6e5ea91deeec64e68e4f9c54181047c53322f0fc912100a61318e99b2939d33d0b94ef8c4bad5dd537cadf875a1d8cc6c5e069b7b3cba1c49d573  libretro-neocd-327aeceecdf71c8a0c0af3d6dc53686c94fe44ad.tar.gz
+bc689c7c686f917dbaff889ddef761a89d2f552ca0905f0c9c554e3d4c8117fc4a972a3dc1322699f0ff558db7a71b6206a383a34ca3739d8ca82a5c11d81da8  patch-unbundle.patch
+"

testing/libretro-neocd/patch-unbundle.patch

@@ -1,51 +1,47 @@
---- neocd_libretro-fc85ed4f5e3d075945493a3ae103df53b63cb340/Makefile.common.orig
-+++ neocd_libretro-fc85ed4f5e3d075945493a3ae103df53b63cb340/Makefile.common
-@@ -1,23 +1,25 @@
+Remove bundled dependencies.
+
+We have to keep minizip for now because the newest API is not backward
+compatible with the core codebase.
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -1,22 +1,22 @@
  LIBRETRO_DEPS_DIR    = $(CORE_DIR)/deps
 -LIBOGG_DIR           = $(LIBRETRO_DEPS_DIR)/libogg
 -LIBVORBIS_DIR        = $(LIBRETRO_DEPS_DIR)/libvorbis
  LIBCHDR_DIR          = $(LIBRETRO_DEPS_DIR)/libchdr
 -ZLIB_DIR             = $(LIBCHDR_DIR)/deps/zlib-1.2.11
--MINIZIP_DIR          = $(LIBRETRO_DEPS_DIR)/minizip
+ MINIZIP_DIR          = $(LIBRETRO_DEPS_DIR)/minizip
  LZMA_DIR             = $(LIBCHDR_DIR)/deps/lzma-19.00
- LIBRETRO_COMMON_DIR  = $(LIBRETRO_DEPS_DIR)/libretro-common
+ LIBRETRO_COMM_DIR    = $(LIBRETRO_DEPS_DIR)/libretro-common
  
-+MINIZIP_INCS := $(shell pkg-config --cflags minizip)
-+MINIZIP_LIBS := $(shell pkg-config --libs minizip)
 +VORBIS_INCS := $(shell pkg-config --cflags vorbisfile)
 +VORBIS_LIBS := $(shell pkg-config --libs vorbisfile)
 +OGG_INCS := $(shell pkg-config --cflags ogg)
 +OGG_LIBS := $(shell pkg-config --libs ogg)
-+LIBZIP_INCS := $(shell pkg-config --cflags libzip)
-+LIBZIP_LIBS := $(shell pkg-config --libs libzip)
 +ZLIB_INCS := $(shell pkg-config --cflags zlib)
 +ZLIB_LIBS := $(shell pkg-config --libs zlib)
 +
  INCFLAGS :=  \
  	-I$(CORE_DIR)/src \
- 	-I$(LIBRETRO_COMMON_DIR)/include \
+ 	-I$(LIBRETRO_COMM_DIR)/include \
  	-I$(LIBRETRO_DEPS_DIR)/ \
  	-I$(LIBCHDR_DIR)/include \
--	-I$(LZMA_DIR)/include \
+ 	-I$(LZMA_DIR)/include \
 -	-I$(LIBOGG_DIR)/include \
 -	-I$(LIBVORBIS_DIR)/include \
 -	-I$(LIBVORBIS_DIR)/lib \
 -	-I$(ZLIB_DIR) \
--	-I$(MINIZIP_DIR)
-+	-I$(LZMA_DIR)/include
+ 	-I$(MINIZIP_DIR)
  
  SOURCES_CXX :=\
- 	$(CORE_DIR)/src/archive.cpp \
-@@ -106,48 +108,18 @@
- 	$(LZMA_DIR)/src/LzmaEnc.c \
+@@ -113,46 +113,17 @@
  	$(LZMA_DIR)/src/Sort.c
  
--SOURCES_C += \
+ SOURCES_C += \
 -	$(LIBOGG_DIR)/src/bitwise.c \
 -	$(LIBOGG_DIR)/src/framing.c
 -
 -SOURCES_C += \
--	$(LIBVORBIS_DIR)/lib/analysis.c \
 -	$(LIBVORBIS_DIR)/lib/bitrate.c \
 -	$(LIBVORBIS_DIR)/lib/block.c \
 -	$(LIBVORBIS_DIR)/lib/codebook.c \
@@ -79,21 +75,17 @@
 -	$(ZLIB_DIR)/zutil.c
 -
 -SOURCES_C += \
--	$(MINIZIP_DIR)/ioapi.c \
--	$(MINIZIP_DIR)/unzip.c
--
+ 	$(MINIZIP_DIR)/ioapi.c \
+ 	$(MINIZIP_DIR)/unzip.c
+ 
  ifneq ($(STATIC_LINKING),1)
  SOURCES_C +=	$(SRC_LIBRETRO_COMMON)
  endif
 +
-+INCFLAGS += ${MINIZIP_INCS}
 +INCFLAGS += ${VORBIS_INCS}
 +INCFLAGS += ${OGG_INCS}
-+INCFLAGS += ${LIBZIP_INCS}
 +INCFLAGS += ${ZLIB_INCS}
 +
-+LIBS += ${MINIZIP_LIBS}
 +LIBS += ${VORBIS_LIBS}
 +LIBS += ${OGG_LIBS}
-+LIBS += ${LIBZIP_LIBS}
 +LIBS += ${ZLIB_LIBS}