From 8f59fbf9ca4ee7b31b3fa130918d87bb48b9c064 Mon Sep 17 00:00:00 2001 From: David Demelier Date: Tue, 19 Apr 2022 10:59:50 +0200 Subject: [PATCH] testing/libretro-cap32: upgrade to 0_git20220419 --- testing/libretro-cap32/APKBUILD | 17 ++++---- testing/libretro-cap32/patch-unbundle.patch | 45 --------------------- 2 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 testing/libretro-cap32/patch-unbundle.patch diff --git a/testing/libretro-cap32/APKBUILD b/testing/libretro-cap32/APKBUILD index 547b1f4b8ee..4499c2637f5 100644 --- a/testing/libretro-cap32/APKBUILD +++ b/testing/libretro-cap32/APKBUILD @@ -1,22 +1,18 @@ # Contributor: David Demelier # Maintainer: David Demelier pkgname=libretro-cap32 -pkgver=0_git20210327 -pkgrel=1 -_commit="408da091504dabe9678b25b7a6c3bbef0bc4c140" +pkgver=0_git20220419 +pkgrel=0 +_commit="20adc49260677f7e99325f1ce14caabc1878e1be" pkgdesc="caprice32 emulator for libretro" url="https://github.com/libretro/libretro-cap32" arch="all" license="GPL-2.0-only" -makedepends="zlib-dev" -source="$pkgname-$_commit.tar.gz::https://github.com/libretro/libretro-cap32/archive/$_commit.tar.gz - patch-unbundle.patch - " +source="$pkgname-$_commit.tar.gz::https://github.com/libretro/libretro-cap32/archive/$_commit.tar.gz" builddir="$srcdir/libretro-cap32-$_commit" options="!check" # No tests build() { - rm -rf utils/zlib make } @@ -24,5 +20,6 @@ package() { install -Dm644 cap32_libretro.so "$pkgdir"/usr/lib/libretro/cap32_libretro.so } -sha512sums="99ba8366e0e70de12da4c539cf30862041e980471bd5d7def29676e2633b1a3f7f490dc7a3f6184303da365a10a433511318ca96b7c1a18e6800e8108a7e0149 libretro-cap32-408da091504dabe9678b25b7a6c3bbef0bc4c140.tar.gz -4eb922cacea0cf042faa73607e9ce37f888eff19f487be4c35b6fae610fda09390f383a138747c9467bf363a5bad4bc956d3ebb6cc156ac54c086312b940fadf patch-unbundle.patch" +sha512sums=" +89a168409d6483b370b69cc2c6702999101820a402bcd4d00f098c2eb0b9f724c9bcfe28eec9e31a0e417092c16ba9be6c6091aadd6ddf420b9bc2e018b88065 libretro-cap32-20adc49260677f7e99325f1ce14caabc1878e1be.tar.gz +" diff --git a/testing/libretro-cap32/patch-unbundle.patch b/testing/libretro-cap32/patch-unbundle.patch deleted file mode 100644 index 5fa1b800ac5..00000000000 --- a/testing/libretro-cap32/patch-unbundle.patch +++ /dev/null @@ -1,45 +0,0 @@ -Remove bundled zlib. ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,7 @@ - - SOURCES_C := - SOURCES_CXX := --LIBS := -+LIBS := -lz - - ifeq ($(platform),) - platform = unix ---- a/Makefile.common -+++ b/Makefile.common -@@ -10,8 +10,7 @@ - -I$(LIBRETRO_COMM_DIR)/include \ - -I$(GUI) \ - -I$(GUI)/nuklear \ -- -I$(GUI)/retro \ -- -I$(DEPS)/zlib -+ -I$(GUI)/retro - - SOURCES_C := \ - $(CORE_DIR)/libretro/libretro-core.c \ -@@ -34,20 +33,6 @@ - $(CORE_DIR)/libretro/retro_disk_control.c \ - $(CORE_DIR)/libretro/retro_events.c \ - $(CORE_DIR)/libretro/retro_snd.c -- --SOURCES_C += \ -- $(DEPS)/zlib/adler32.c \ -- $(DEPS)/zlib/inflate.c \ -- $(DEPS)/zlib/inffast.c \ -- $(DEPS)/zlib/inftrees.c \ -- $(DEPS)/zlib/zutil.c \ -- $(DEPS)/zlib/gzread.c \ -- $(DEPS)/zlib/gzwrite.c \ -- $(DEPS)/zlib/gzclose.c \ -- $(DEPS)/zlib/gzlib.c \ -- $(DEPS)/zlib/trees.c \ -- $(DEPS)/zlib/crc32.c \ -- $(DEPS)/zlib/deflate.c - - ifneq ($(STATIC_LINKING), 1) - SOURCES_C += \