Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
sambuc
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emulators/mame/Makefile
+2 -8
View File
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.28 2014/03/26 01:42:48 nat Exp $
# $NetBSD: Makefile,v 1.38 2015/02/28 11:58:53 wiz Exp $
DISTNAME= mame0152s
DISTNAME= mame0159s
PKGNAME= ${DISTNAME:S/0/-0./:S/s$//}
PKGREVISION= 1
MASTER_SITES= http://mamedev.org/downloader.php?file=releases/
COMMENT= Multiple Arcade Machine Emulator
@@ -12,11 +11,6 @@ CONFLICTS= xmame-[0-9]* sdlmame-[0-9]*
DOCDIR= share/doc/mame
INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6
# mame source is double-zipped
post-extract:
cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
rm ${WRKDIR}/mame.zip
# not installed, because not found necessary so far:
# regrep, split, src2html, srcclean, testkeys
do-install:
emulators/mame/Makefile.common
+31 -8
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.14 2014/03/26 01:42:48 nat Exp $
# $NetBSD: Makefile.common,v 1.20 2015/01/29 20:00:29 wiz Exp $
#
# used by emulators/mame/Makefile
# used by emulators/mess/Makefile
@@ -14,15 +14,15 @@ RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
BUILD_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf
WRKSRC= ${WRKDIR}
# separate distinfos though, so don't forget 'make mdi' when
# adding or changing patches
#PATCHDIR= ${.CURDIR}/../../emulators/mame/patches
PATCHDIR= ${.CURDIR}/../../emulators/mame/patches
DISTINFO_FILE= ${.CURDIR}/../../emulators/mame/distinfo
USE_LANGUAGES= c c++
USE_LANGUAGES= c99 c++
USE_TOOLS+= gmake pkg-config
UNLIMIT_RESOURCES+= datasize
MAKE_FILE= makefile
@@ -43,6 +43,16 @@ _WRAP_EXTRA_ARGS.CC+= -Wno-error=cast-align \
-Wno-error=self-assign-field \
-Wno-error=unused-const-variable \
-Wno-error=unused-function
CWRAPPERS_APPEND.cc+= -Wno-error=cast-align \
-Wno-error=constant-logical-operand \
-Wno-error=sometimes-uninitialized \
-Wno-error=shift-count-overflow \
-Wno-error=unused-private-field \
-Wno-error=tautological-constant-out-of-range-compare \
-Wno-error=tautological-compare \
-Wno-error=self-assign-field \
-Wno-error=unused-const-variable \
-Wno-error=unused-function
MAKE_ENV+= OPTIMIZE=2
.endif
@@ -59,13 +69,26 @@ SUBST_STAGE.exe= post-patch
SUBST_MESSAGE.exe= Fixing executable name.
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.151
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.151
# mame source is double-zipped
post-extract:
cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
rm ${WRKDIR}/mame.zip
# This needs to be done for every file that is patched.
${RUN} for f in 3rdparty/mongoose/mongoose.c makefile src/osd/sdl/sdl.mak; do \
${CP} ${WRKSRC}/$${f} ${WRKSRC}/$${f}.bak; \
${CAT} ${WRKSRC}/$${f}.bak | dos2unix >${WRKSRC}/$${f}; \
done
.include "../../lang/python/application.mk"
.include "../../audio/flac/buildlink3.mk"
.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/SDL_ttf/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../fonts/SDL2_ttf/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
emulators/mame/distinfo
+5 -9
View File
@@ -1,10 +1,6 @@
$NetBSD: distinfo,v 1.19 2014/03/26 01:42:48 nat Exp $
$NetBSD: distinfo,v 1.33 2015/03/31 16:35:29 joerg Exp $
SHA1 (mame0152s.zip) = 2e11509b39c13dc1336a48a102813589b0793788
RMD160 (mame0152s.zip) = d8f4accbd639e085c6165374d7b7ebd427d3c4d7
Size (mame0152s.zip) = 36247883 bytes
SHA1 (patch-src_emu_emualloc.c) = 6df67d1d1aaf982444db3db65c066bc83644ae9b
SHA1 (patch-src_emu_emualloc.h) = 22cdfbc002cda8053125ef8cedf3bcceea04deaf
SHA1 (patch-src_emu_netlist_nl__base.h) = 9ee165f601da849a339699f560c371bc58dd0d83
SHA1 (patch-src_emu_netlist_nl__lists.h) = d31c9cf715f66520e4a1a09584f1c52bbea74fef
SHA1 (patch-src_emu_netlist_pstate.h) = 4f43b1c621ea7db3e8d31107e48e06acecfb841e
SHA1 (mame0159s.zip) = 0170b73e45dcaa6c9842948f69c54310bf314934
RMD160 (mame0159s.zip) = 9b02aeeebf956c453b2c041c6c40c2952ce3521c
Size (mame0159s.zip) = 80801723 bytes
SHA1 (patch-makefile) = 57837dbc8571682e4fd73a2be5771df109c7225f
emulators/mame/patches/patch-makefile
+50
View File
@@ -0,0 +1,50 @@
$NetBSD: patch-makefile,v 1.11 2015/03/31 16:35:29 joerg Exp $
Link against pkgsrc versions of expat, zlib, flac, jpeg, and
sqlite3, and add appropriate linker search paths.
--- makefile.orig 2015-02-28 10:39:06.000000000 +0000
+++ makefile
@@ -227,19 +227,19 @@ endif
# BIGENDIAN = 1
# uncomment next line to build expat as part of MAME build
-BUILD_EXPAT = 1
+#BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
-BUILD_ZLIB = 1
+#BUILD_ZLIB = 1
# uncomment next line to build libflac as part of MAME build
-BUILD_FLAC = 1
+#BUILD_FLAC = 1
# uncomment next line to build jpeglib as part of MAME build
-BUILD_JPEGLIB = 1
+#BUILD_JPEGLIB = 1
# uncomment next line to build libsqlite3 as part of MAME/MESS build
-BUILD_SQLITE3 = 1
+#BUILD_SQLITE3 = 1
# uncomment next line to build PortMidi as part of MAME/MESS build
BUILD_MIDILIB = 1
@@ -527,7 +527,7 @@ CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(
# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions
-CONLYFLAGS += -std=gnu89
+CONLYFLAGS += -std=gnu99
ifdef CPP11
CPPONLYFLAGS += -x c++ -std=gnu++11
else
@@ -742,7 +742,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG
#-------------------------------------------------
# start with an empty set of libs
-LIBS =
+LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
# add expat XML library
ifeq ($(BUILD_EXPAT),1)
emulators/mame/patches/patch-src_emu_emualloc.c
-18
View File
@@ -1,18 +0,0 @@
$NetBSD: patch-src_emu_emualloc.c,v 1.1 2014/03/26 01:42:48 nat Exp $
This resolves a crash on startup.
--- src/emu/emualloc.c.orig 2013-10-15 22:14:50.000000000 +0000
+++ src/emu/emualloc.c
@@ -266,6 +266,11 @@ void resource_pool::add(resource_pool_it
memory_entry *entry = memory_entry::find(item.m_ptr);
if (entry == NULL)
entry = memory_entry::find(reinterpret_cast<UINT8 *>(item.m_ptr) - sizeof(size_t));
+ if (entry == NULL) {
+ osd_lock_release(m_listlock);
+ return;
+ }
+
assert(entry != NULL);
item.m_id = entry->m_id;
if (LOG_ALLOCS)
emulators/mame/patches/patch-src_emu_emualloc.h
-20
View File
@@ -1,20 +0,0 @@
$NetBSD: patch-src_emu_emualloc.h,v 1.1 2013/12/18 17:55:15 joerg Exp $
--- src/emu/emualloc.h.orig 2013-10-16 09:14:50.000000000 +0000
+++ src/emu/emualloc.h
@@ -77,6 +77,7 @@ void dump_unfreed_mem();
// zeromem_t is a dummy class used to tell new to zero memory after allocation
class zeromem_t { };
+#if 0
#ifndef NO_MEM_TRACKING
// standard new/delete operators (try to avoid using)
@@ -109,6 +110,7 @@ ATTR_FORCE_INLINE inline void operator d
}
#endif
+#endif
// file/line new/delete operators
ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc)
emulators/mame/patches/patch-src_emu_netlist_nl__base.h
-24
View File
@@ -1,24 +0,0 @@
$NetBSD: patch-src_emu_netlist_nl__base.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
clang fixes from upstream SVN 26743.
--- src/emu/netlist/nl_base.h.orig 2013-12-24 08:24:52.000000000 +0000
+++ src/emu/netlist/nl_base.h
@@ -287,7 +287,7 @@ public:
ATTR_COLD const pstring &name() const;
- PSTATE_INTERFACE(*m_netlist, name())
+ PSTATE_INTERFACE_DECL()
#if 0
template<class C> ATTR_COLD void save(C &state, const pstring &stname)
@@ -1120,6 +1120,8 @@ private:
// Inline implementations
// ----------------------------------------------------------------------------------------
+PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
+
ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
{
m_param = param;
emulators/mame/patches/patch-src_emu_netlist_nl__lists.h
-15
View File
@@ -1,15 +0,0 @@
$NetBSD: patch-src_emu_netlist_nl__lists.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
clang fixes from upstream SVN 26917.
--- src/emu/netlist/nl_lists.h.orig 2013-12-24 08:24:52.000000000 +0000
+++ src/emu/netlist/nl_lists.h
@@ -16,7 +16,7 @@
template <class _ListClass, int _NumElem = 128>
-struct netlist_list_t
+class netlist_list_t
{
public:
emulators/mame/patches/patch-src_emu_netlist_pstate.h
-25
View File
@@ -1,25 +0,0 @@
$NetBSD: patch-src_emu_netlist_pstate.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
clang fixes from upstream SVN 26743.
--- src/emu/netlist/pstate.h.orig 2013-12-24 08:24:52.000000000 +0000
+++ src/emu/netlist/pstate.h
@@ -15,11 +15,15 @@
// state saving ...
// ----------------------------------------------------------------------------------------
-#define PSTATE_INTERFACE(manager, module) \
- template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
+#define PSTATE_INTERFACE_DECL() \
+ template<typename C> ATTR_COLD void save(C &state, const pstring &stname);
+
+#define PSTATE_INTERFACE(obj, manager, module) \
+ template<typename C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
{ \
- dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname); \
+ manager->save_manager(state, module + "." + stname); \
}
+
enum netlist_data_type_e {
NOT_SUPPORTED,