Tue Jun 2 14:51:03 2020 UTC ()
libretro-picodrive: don't compile in a redundant copy of zlib


(nia)
diff -r1.9 -r1.10 pkgsrc/emulators/libretro-picodrive/Makefile
diff -r1.5 -r1.6 pkgsrc/emulators/libretro-picodrive/distinfo
diff -r0 -r1.1 pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile
cvs diff -r1.9 -r1.10 pkgsrc/emulators/libretro-picodrive/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-picodrive/Makefile 2020/05/30 14:32:32 1.9
+++ pkgsrc/emulators/libretro-picodrive/Makefile 2020/06/02 14:51:03 1.10
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2020/05/30 14:32:32 nia Exp $ 1# $NetBSD: Makefile,v 1.10 2020/06/02 14:51:03 nia Exp $
2 2
3DISTNAME= libretro-picodrive-20200527 3DISTNAME= libretro-picodrive-20200527
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5GITHUB_PROJECT= picodrive 6GITHUB_PROJECT= picodrive
6GITHUB_TAG= b8fb8f285317632f42ecbbd36cf4fe18ea9189f1 7GITHUB_TAG= b8fb8f285317632f42ecbbd36cf4fe18ea9189f1
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://docs.libretro.com/library/picodrive/ 10HOMEPAGE= https://docs.libretro.com/library/picodrive/
10COMMENT= Libretro core based on the Picodrive MegaDrive/MegaCD/32X emulator 11COMMENT= Libretro core based on the Picodrive MegaDrive/MegaCD/32X emulator
11LICENSE= mame-license 12LICENSE= mame-license
12 13
13MAKE_FILE= Makefile.libretro 14MAKE_FILE= Makefile.libretro
14 15
15.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
16 17
cvs diff -r1.5 -r1.6 pkgsrc/emulators/libretro-picodrive/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-picodrive/distinfo 2020/05/30 14:32:32 1.5
+++ pkgsrc/emulators/libretro-picodrive/distinfo 2020/06/02 14:51:03 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2020/05/30 14:32:32 nia Exp $ 1$NetBSD: distinfo,v 1.6 2020/06/02 14:51:03 nia Exp $
2 2
3SHA1 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 94f7f72adbc3b2fc3afb7ccf4e571e667d1f0ebc 3SHA1 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 94f7f72adbc3b2fc3afb7ccf4e571e667d1f0ebc
4RMD160 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = f7fe39aadc2da256cab70a44542bd496cdeac1f3 4RMD160 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = f7fe39aadc2da256cab70a44542bd496cdeac1f3
5SHA512 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 9f6720421beeef30bfaefc46bd814f0f1a461d0e7517a0f72181aae0acf59086293a225e20e7ac091575ded3455f71e68c242166b32256ba4d0590e995b7561d 5SHA512 (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 9f6720421beeef30bfaefc46bd814f0f1a461d0e7517a0f72181aae0acf59086293a225e20e7ac091575ded3455f71e68c242166b32256ba4d0590e995b7561d
6Size (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 1439548 bytes 6Size (libretro-picodrive-20200527-b8fb8f285317632f42ecbbd36cf4fe18ea9189f1.tar.gz) = 1439548 bytes
 7SHA1 (patch-Makefile) = bf73e5c8e3d78e127ec23073e8a4cbba2a95248f
File Added: pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2020/06/02 14:51:03 nia Exp $

Don't use bundled zlib.

--- Makefile.orig	2020-05-27 19:43:14.000000000 +0000
+++ Makefile
@@ -177,12 +177,6 @@ else
 OBJS += platform/common/mp3_dummy.o
 endif
 
-ifeq "$(PLATFORM)" "libretro"
-# zlib
-OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
-	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
-CFLAGS += -Izlib
-endif
 # unzip
 OBJS += unzip/unzip.o