From ce752b47dda3576d04712418bee69b1ad15f8905 Mon Sep 17 00:00:00 2001 From: David Demelier Date: Thu, 3 Jun 2021 13:48:53 +0200 Subject: [PATCH] testing/libretro-fbneo: remove bundled deps --- testing/libretro-fbneo/APKBUILD | 11 ++++++++--- testing/libretro-fbneo/patch-unbundle.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 testing/libretro-fbneo/patch-unbundle.patch diff --git a/testing/libretro-fbneo/APKBUILD b/testing/libretro-fbneo/APKBUILD index e6fbea2a456..d55f8a5bb4a 100644 --- a/testing/libretro-fbneo/APKBUILD +++ b/testing/libretro-fbneo/APKBUILD @@ -2,17 +2,21 @@ # Maintainer: David Demelier pkgname=libretro-fbneo pkgver=0_git20210504 -pkgrel=0 +pkgrel=1 _commit="9558e146597dff8390e8808a87f94b839e5dd791" pkgdesc="FinalBurn Neo, an Emulator for Arcade Games & Select Consoles" url="https://github.com/libretro/FBNeo" arch="all !mips !mips64" # fails to build on mips license="custom" -source="$pkgname-$_commit.tar.gz::https://github.com/libretro/FBNeo/archive/$_commit.tar.gz" +makedepends="zlib-dev" +source="$pkgname-$_commit.tar.gz::https://github.com/libretro/FBNeo/archive/$_commit.tar.gz + patch-unbundle.patch + " builddir="$srcdir/FBNeo-$_commit" options="!check" # No tests build() { + rm -rf src/dep/libs/zlib make -C src/burner/libretro } @@ -20,4 +24,5 @@ package() { install -Dm644 src/burner/libretro/fbneo_libretro.so "$pkgdir"/usr/lib/libretro/fbneo_libretro.so } -sha512sums="55a9c3f2789ee0597ae01b7c735ca3aa743469daa5a3f01cdda08a0f955a2d26349f5cd60051502b9c085a0da069cf97b600921fc60f18e71b12e4051101ccc9 libretro-fbneo-9558e146597dff8390e8808a87f94b839e5dd791.tar.gz" +sha512sums="55a9c3f2789ee0597ae01b7c735ca3aa743469daa5a3f01cdda08a0f955a2d26349f5cd60051502b9c085a0da069cf97b600921fc60f18e71b12e4051101ccc9 libretro-fbneo-9558e146597dff8390e8808a87f94b839e5dd791.tar.gz +d2791aaa0984f73fc44afbefb37d825f78e5e690dc3c5c29852ae992aab88f049fa4142d63630656d184e0aa7ebd9a52e1db344b557b3794aaea9e2b527390b2 patch-unbundle.patch" diff --git a/testing/libretro-fbneo/patch-unbundle.patch b/testing/libretro-fbneo/patch-unbundle.patch new file mode 100644 index 00000000000..4d2d491fa4c --- /dev/null +++ b/testing/libretro-fbneo/patch-unbundle.patch @@ -0,0 +1,12 @@ +Remove bundled zlib. +--- a/src/burner/libretro/Makefile ++++ b/src/burner/libretro/Makefile +@@ -692,6 +692,8 @@ + LD = $(CXX) + endif + ++LIBS += -lz ++ + %.o: %.c + $(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS) +