CVS commit: pkgsrc/emulators/libretro-bluemsx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun  2 14:08:58 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-bluemsx: Makefile distinfo
Added Files:
        pkgsrc/emulators/libretro-bluemsx/patches: patch-Makefile.common

Log Message:
libretro-bluemsx: don't use bundled zlib


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/libretro-bluemsx/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-bluemsx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/libretro-bluemsx/patches/patch-Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/libretro-bluemsx/Makefile
diff -u pkgsrc/emulators/libretro-bluemsx/Makefile:1.6 pkgsrc/emulators/libretro-bluemsx/Makefile:1.7
--- pkgsrc/emulators/libretro-bluemsx/Makefile:1.6      Sun May 31 11:39:55 2020
+++ pkgsrc/emulators/libretro-bluemsx/Makefile  Tue Jun  2 14:08:58 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2020/05/31 11:39:55 nia Exp $
+# $NetBSD: Makefile,v 1.7 2020/06/02 14:08:58 nia Exp $
 
 DISTNAME=      libretro-bluemsx-20200507
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=        blueMSX-libretro
@@ -13,8 +14,11 @@ LICENSE=     gnu-gpl-v2
 
 MAKE_FILE=     Makefile.libretro
 USE_LANGUAGES= c c++03
+
 LIBRETRO_CORE= bluemsx
 
+LDFLAGS+=      -lz
+
 .include "../../mk/bsd.prefs.mk"
 
 # For strcasestr
@@ -31,4 +35,5 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-Wl,-vers
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-no-undefined
 
 .include "../../emulators/retroarch/core.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/libretro-bluemsx/distinfo
diff -u pkgsrc/emulators/libretro-bluemsx/distinfo:1.3 pkgsrc/emulators/libretro-bluemsx/distinfo:1.4
--- pkgsrc/emulators/libretro-bluemsx/distinfo:1.3      Sun May 31 11:39:55 2020
+++ pkgsrc/emulators/libretro-bluemsx/distinfo  Tue Jun  2 14:08:58 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/05/31 11:39:55 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/06/02 14:08:58 nia Exp $
 
 SHA1 (libretro-bluemsx-20200507-1d441d908e73cf0fa7f52c42686f6c9e8cd254ed.tar.gz) = 806e420743d03766449e1cfcd30c7493117919c8
 RMD160 (libretro-bluemsx-20200507-1d441d908e73cf0fa7f52c42686f6c9e8cd254ed.tar.gz) = c97f9d5df76fe37eeea20914c051293cb73b10f1
 SHA512 (libretro-bluemsx-20200507-1d441d908e73cf0fa7f52c42686f6c9e8cd254ed.tar.gz) = 
30042d707ff4f5e2d54f413f81b7ca75b5e7595c1694b611ab67435c160a18db65e9f906872d310c70254a7dba6180845ae9fe47d7e86c010375d79d6eb59397
 Size (libretro-bluemsx-20200507-1d441d908e73cf0fa7f52c42686f6c9e8cd254ed.tar.gz) = 6604169 bytes
+SHA1 (patch-Makefile.common) = 2601dbb7b1eed787df7cadc9d93cf5c51f013bf6

Added files:

Index: pkgsrc/emulators/libretro-bluemsx/patches/patch-Makefile.common
diff -u /dev/null pkgsrc/emulators/libretro-bluemsx/patches/patch-Makefile.common:1.1
--- /dev/null   Tue Jun  2 14:08:58 2020
+++ pkgsrc/emulators/libretro-bluemsx/patches/patch-Makefile.common     Tue Jun  2 14:08:58 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-Makefile.common,v 1.1 2020/06/02 14:08:58 nia Exp $
+
+Don't use bundled zlib.
+
+--- Makefile.common.orig       2020-05-07 17:41:19.000000000 +0000
++++ Makefile.common
+@@ -24,8 +24,7 @@ INCFLAGS := -I$(CORE_DIR) \
+                               -I$(CORE_DIR)/Src/VideoRender \
+                               -I$(CORE_DIR)/Src/Z80 \
+                               -I$(CORE_DIR)/Src/Input \
+-                              -I$(CORE_DIR)/Src/Libretro \
+-                              -I$(DEPS_DIR)/zlib
++                              -I$(CORE_DIR)/Src/Libretro
+ 
+ ifneq (,$(findstring msvc2003,$(platform)))
+ INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
+@@ -332,22 +331,6 @@ ifneq ($(STATIC_LINKING), 1)
+ SOURCES_C += $(LIBRETRO_COMM_DIR)/file/retro_dirent.c \
+                                $(LIBRETRO_COMM_DIR)/compat/compat_snprintf.c \
+                                $(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c
+-
+-#include zlib
+-SOURCES_C += $(DEPS_DIR)/zlib/adler32.c \
+-                               $(DEPS_DIR)/zlib/compress.c \
+-                               $(DEPS_DIR)/zlib/crc32.c \
+-                               $(DEPS_DIR)/zlib/deflate.c \
+-                               $(DEPS_DIR)/zlib/gzclose.c \
+-                               $(DEPS_DIR)/zlib/gzlib.c \
+-                               $(DEPS_DIR)/zlib/gzread.c \
+-                               $(DEPS_DIR)/zlib/gzwrite.c \
+-                               $(DEPS_DIR)/zlib/inffast.c \
+-                               $(DEPS_DIR)/zlib/inflate.c \
+-                               $(DEPS_DIR)/zlib/inftrees.c \
+-                               $(DEPS_DIR)/zlib/trees.c \
+-                               $(DEPS_DIR)/zlib/uncompr.c \
+-                               $(DEPS_DIR)/zlib/zutil.c
+ endif
+ 
+ ifeq ($(HAVE_COMPAT), 1)