pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libretro-mame2014: Don't use bundled libraries



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sat Aug 5 13:08:16 2017 +0100
Changeset:	62a927c5b73b15c2fb9564adf606313595632505

Modified Files:
	libretro-mame2014/Makefile
	libretro-mame2014/distinfo
	libretro-mame2014/patches/patch-Makefile

Log Message:
libretro-mame2014: Don't use bundled libraries

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62a927c5b73b15c2fb9564adf606313595632505

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

diffstat:
 libretro-mame2014/Makefile               |  4 ++++
 libretro-mame2014/distinfo               |  2 +-
 libretro-mame2014/patches/patch-Makefile | 37 +++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diffs:
diff --git a/libretro-mame2014/Makefile b/libretro-mame2014/Makefile
index 3a37ed3466..28f24e5efc 100644
--- a/libretro-mame2014/Makefile
+++ b/libretro-mame2014/Makefile
@@ -46,5 +46,9 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/mame2014_libretro.so \
 	    ${DESTDIR}${PREFIX}/lib/libretro/mame2014_libretro.so
 
+.include "../../audio/flac/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-mame2014/distinfo b/libretro-mame2014/distinfo
index 2c945895c0..b5166f16d6 100644
--- a/libretro-mame2014/distinfo
+++ b/libretro-mame2014/distinfo
@@ -4,5 +4,5 @@ SHA1 (libretro-mame2014-20170722-c2438a94638da31fbf5f5761d9a6c5a43db61c4d.tar.gz
 RMD160 (libretro-mame2014-20170722-c2438a94638da31fbf5f5761d9a6c5a43db61c4d.tar.gz) = b86e7d1c426b7bc090f0b9cf8866cab63c896f18
 SHA512 (libretro-mame2014-20170722-c2438a94638da31fbf5f5761d9a6c5a43db61c4d.tar.gz) = 955664611712a75797fc92997e89578a5b446a5b717a359904809f75e724cb29144c37c89582ce08d789cdc42f4cd1981a1d844174f7f130727c2259462afd2e
 Size (libretro-mame2014-20170722-c2438a94638da31fbf5f5761d9a6c5a43db61c4d.tar.gz) = 55146194 bytes
-SHA1 (patch-Makefile) = 9f59427598171177f53ba0434e6c8a4febf0868c
+SHA1 (patch-Makefile) = 8cd384f6a58f66de5ddf881c090fdd2c4e3612db
 SHA1 (patch-src_emu_hiscore.c) = a6f36ae44d9cb6c98f5da51a602a184aab75a7b2
diff --git a/libretro-mame2014/patches/patch-Makefile b/libretro-mame2014/patches/patch-Makefile
index 4755a9876b..5fc9364b97 100644
--- a/libretro-mame2014/patches/patch-Makefile
+++ b/libretro-mame2014/patches/patch-Makefile
@@ -1,10 +1,32 @@
 $NetBSD$
 
-Avoid linuxisms.
+Avoid linuxisms and don't use bundled libraries.
 
---- Makefile.orig	2017-03-16 20:39:20.000000000 +0000
+--- Makefile.orig	2017-07-22 21:19:48.000000000 +0000
 +++ Makefile
-@@ -135,13 +135,13 @@ ifneq (,$(findstring unix,$(platform)))
+@@ -100,21 +100,6 @@ endif
+ $(info CFLAGS = $(CONLYFLAGS))
+ $(info CPPFLAGS = $(CPPONLYFLAGS))
+ 
+-# uncomment next line to build expat as part of MAME build
+-BUILD_EXPAT = 1
+-
+-# uncomment next line to build zlib as part of MAME build
+-ifneq ($(platform), android)
+-   ifneq ($(platform), emscripten)
+-      BUILD_ZLIB = 1
+-   endif
+-endif
+-# uncomment next line to build libflac as part of MAME build
+-BUILD_FLAC = 1
+-
+-# uncomment next line to build jpeglib as part of MAME build
+-BUILD_JPEGLIB = 1
+-
+ # uncomment next line to build PortMidi as part of MAME/MESS build
+ #BUILD_MIDILIB = 1
+ VRENDER ?= soft
+@@ -135,13 +120,13 @@ ifneq (,$(findstring unix,$(platform)))
     REALCC ?= gcc
     NATIVECC ?= g++
     NATIVECFLAGS ?= -std=gnu99
@@ -20,3 +42,12 @@ Avoid linuxisms.
     ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64)
        PTR64 = 1
     endif
+@@ -764,7 +749,7 @@ endif
+ 
+ ifneq (,$(findstring clang,$(CC)))
+ ifneq ($(platform), android)
+-LIBS += -lstdc++ -lpthread
++LIBS += -pthread
+ endif
+ endif
+ #-------------------------------------------------


Home | Main Index | Thread Index | Old Index