[mame] 01/06: New upstream release 0.176.
Jordi Mallach
jordi at moszumanska.debian.org
Thu Jul 28 05:39:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
jordi pushed a commit to branch master
in repository mame.
commit d1b9db7d0880df7e37188f38ff8086b0b1ffbdcb
Author: Jordi Mallach <jordi at debian.org>
Date: Wed Jul 27 13:21:50 2016 +0200
New upstream release 0.176.
Remove patches merged upstream.
Build-Depend on libutil-freebsd-dev on kfreebsd-any.
---
debian/changelog | 20 +++---
debian/control | 1 +
debian/patches/hurd.patch | 77 +++++++++-------------
debian/patches/kfreebsd.patch | 74 ---------------------
.../remove-m64_flag_for_mips64el_alpha.patch | 59 -----------------
debian/patches/series | 2 -
6 files changed, 43 insertions(+), 190 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4f6ed6..bd627d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-mame (0.175-2) unstable; urgency=medium
-
- [ Cesare Falco ]
- * Improved get-orig-source target
- * Updated mame.ini files to most recent *path entries
- * Install samples and additional .ini files as well
+mame (0.176-1) UNRELEASED; urgency=medium
[ Jordi Mallach ]
+ * New upstream release.
+ - Includes Steven Chamberlain's kfreebsd fixes for several build errors
+ on kfreebsd-*. Many thanks! (closes: #830974)
+ - Includes fixes for ppc64el builds (closes: #825483).
* Install bgfx, language, plugins and uismall.bdf files in mame-data.
Thanks to Vas Crabb for pointing this out.
* Add a override_dh_auto_test that just runs "mame -valid" after the build.
@@ -16,11 +15,16 @@ mame (0.175-2) unstable; urgency=medium
* Add an empty override_dh_auto_build-indep rule, so arch-independent
don't actually build the whole thing. Also rename dh_auto_test to
their -arch variants.
- * Add kfreebsd.patch to solve a lot more build issues on kfreebsd-*.
- Many thanks to Steven Chamberlain!
+ * Add libutil-freebsd-dev to Build-Depends for kfreebsd-any.
* Add hurd.patch with some fixes to the build on hurd-i386 systems.
+ * Drop remove-m64_flag_for_mips64el_alpha.patch, merged upstream.
* Make mame build verbosely by default, without entangling it to DH_VERBOSE.
+ [ Cesare Falco ]
+ * Improved get-orig-source target
+ * Updated mame.ini files to most recent *path entries
+ * Install samples and additional .ini files as well
+
-- Cesare Falco <c.falco at ubuntu.com> Fri, 08 Jul 2016 13:08:40 +0200
mame (0.175-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9a090b3..24337a4 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9),
libsdl2-ttf-dev,
libsdl2-dev,
libsqlite3-dev,
+ libutil-freebsd-dev [kfreebsd-any],
libuv1-dev,
libxinerama-dev,
portaudio19-dev,
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index fbe0d84..2fdc42c 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -1,7 +1,7 @@
-Index: mame-0.175/makefile
+Index: mame-0.176/makefile
===================================================================
---- mame-0.175.orig/makefile
-+++ mame-0.175/makefile
+--- mame-0.176.orig/makefile
++++ mame-0.176/makefile
@@ -193,6 +193,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA
OS := openbsd
GENIEOS := bsd
@@ -12,10 +12,10 @@ Index: mame-0.175/makefile
ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
OS := macosx
GENIEOS := darwin
-Index: mame-0.175/scripts/src/osd/sdl.lua
+Index: mame-0.176/scripts/src/osd/sdl.lua
===================================================================
---- mame-0.175.orig/scripts/src/osd/sdl.lua
-+++ mame-0.175/scripts/src/osd/sdl.lua
+--- mame-0.176.orig/scripts/src/osd/sdl.lua
++++ mame-0.176/scripts/src/osd/sdl.lua
@@ -228,6 +228,9 @@ if _OPTIONS["targetos"]=="linux" then
elseif _OPTIONS["targetos"]=="openbsd" then
elseif _OPTIONS["targetos"]=="netbsd" then
@@ -26,10 +26,10 @@ Index: mame-0.175/scripts/src/osd/sdl.lua
elseif _OPTIONS["targetos"]=="haiku" then
elseif _OPTIONS["targetos"]=="asmjs" then
elseif _OPTIONS["targetos"]=="windows" then
-Index: mame-0.175/src/osd/sdl/sdlprefix.h
+Index: mame-0.176/src/osd/sdl/sdlprefix.h
===================================================================
---- mame-0.175.orig/src/osd/sdl/sdlprefix.h
-+++ mame-0.175/src/osd/sdl/sdlprefix.h
+--- mame-0.176.orig/src/osd/sdl/sdlprefix.h
++++ mame-0.176/src/osd/sdl/sdlprefix.h
@@ -41,7 +41,7 @@
/* Large file support on IRIX needs _SGI_SOURCE */
#undef _POSIX_SOURCE
@@ -39,23 +39,10 @@ Index: mame-0.175/src/osd/sdl/sdlprefix.h
#define SDLMAME_LINUX 1
#elif defined(__FreeBSD__)
-Index: mame-0.175/3rdparty/genie/src/host/premake.h
+Index: mame-0.176/src/osd/modules/file/posixfile.cpp
===================================================================
---- mame-0.175.orig/3rdparty/genie/src/host/premake.h
-+++ mame-0.175/3rdparty/genie/src/host/premake.h
-@@ -12,7 +12,7 @@
-
- /* Identify the current platform I'm not sure how to reliably detect
- * Windows but since it is the most common I use it as the default */
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__GNU__)
- #define PLATFORM_LINUX (1)
- #define PLATFORM_STRING "linux"
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-Index: mame-0.175/src/osd/modules/file/posixfile.cpp
-===================================================================
---- mame-0.175.orig/src/osd/modules/file/posixfile.cpp
-+++ mame-0.175/src/osd/modules/file/posixfile.cpp
+--- mame-0.176.orig/src/osd/modules/file/posixfile.cpp
++++ mame-0.176/src/osd/modules/file/posixfile.cpp
@@ -37,6 +37,12 @@
#endif
#endif
@@ -68,11 +55,11 @@ Index: mame-0.175/src/osd/modules/file/posixfile.cpp
+
// MAME headers
#include "posixfile.h"
-
-Index: mame-0.175/src/osd/modules/file/posixptty.cpp
+ #include "unicode.h"
+Index: mame-0.176/src/osd/modules/file/posixptty.cpp
===================================================================
---- mame-0.175.orig/src/osd/modules/file/posixptty.cpp
-+++ mame-0.175/src/osd/modules/file/posixptty.cpp
+--- mame-0.176.orig/src/osd/modules/file/posixptty.cpp
++++ mame-0.176/src/osd/modules/file/posixptty.cpp
@@ -27,10 +27,18 @@
#include <util.h>
#elif defined(__linux__) || defined(EMSCRIPTEN)
@@ -92,10 +79,10 @@ Index: mame-0.175/src/osd/modules/file/posixptty.cpp
namespace {
#if defined(__APPLE__)
-Index: mame-0.175/scripts/genie.lua
+Index: mame-0.176/scripts/genie.lua
===================================================================
---- mame-0.175.orig/scripts/genie.lua
-+++ mame-0.175/scripts/genie.lua
+--- mame-0.176.orig/scripts/genie.lua
++++ mame-0.176/scripts/genie.lua
@@ -117,6 +117,7 @@ newoption {
{ "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
@@ -104,20 +91,16 @@ Index: mame-0.175/scripts/genie.lua
{ "pnacl", "Native Client - PNaCl" },
{ "linux", "Linux" },
{ "ios", "iOS" },
-Index: mame-0.175/3rdparty/luafilesystem/src/lfs.c
+Index: mame-0.176/src/osd/modules/render/drawbgfx.cpp
===================================================================
---- mame-0.175.orig/3rdparty/luafilesystem/src/lfs.c
-+++ mame-0.175/3rdparty/luafilesystem/src/lfs.c
-@@ -60,6 +60,12 @@
- #include <utime.h>
- #endif
+--- mame-0.176.orig/src/osd/modules/render/drawbgfx.cpp
++++ mame-0.176/src/osd/modules/render/drawbgfx.cpp
+@@ -132,7 +132,7 @@ static void* sdlNativeWindowHandle(SDL_W
+ return nullptr;
+ }
-+#ifdef __GNU__
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+#endif
-+
- #include <lua.h>
- #include <lauxlib.h>
- #include <lualib.h>
+-# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD || BX_PLATFORM_RPI
++# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD || BX_PLATFORM_HURD || BX_PLATFORM_RPI
+ return (void*)wmi.info.x11.window;
+ # elif BX_PLATFORM_OSX
+ return wmi.info.cocoa.window;
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
deleted file mode 100644
index 95c7725..0000000
--- a/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/3rdparty/bx/include/bx/thread.h b/3rdparty/bx/include/bx/thread.h
-index add66ab..9e105db 100644
---- a/3rdparty/bx/include/bx/thread.h
-+++ b/3rdparty/bx/include/bx/thread.h
-@@ -8,7 +8,7 @@
-
- #if BX_PLATFORM_POSIX
- # include <pthread.h>
--# if BX_PLATFORM_BSD
-+# if defined(BX_PLATFORM_BSD) && !defined(__GLIBC__)
- # include <pthread_np.h>
- # endif
- # if defined(__GLIBC__) && !( (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) ) )
-@@ -157,12 +157,10 @@ namespace bx
- {
- #if BX_PLATFORM_OSX || BX_PLATFORM_IOS
- pthread_setname_np(_name);
--#elif BX_PLATFORM_LINUX
--# if defined(__GLIBC__) && (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) )
-+#elif defined(__GLIBC__) && (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) )
- pthread_setname_np(m_handle, _name);
--# else
-+#elif BX_PLATFORM_LINUX
- prctl(PR_SET_NAME,_name, 0, 0, 0);
--# endif // defined(__GLIBC__) ...
- #elif BX_PLATFORM_BSD
- #ifdef __NetBSD__
- pthread_setname_np(m_handle, "%s", (void *)_name);
-diff --git a/3rdparty/bx/include/compat/freebsd/alloca.h b/3rdparty/bx/include/compat/freebsd/alloca.h
-index c8b49f2..12a69ea 100644
---- a/3rdparty/bx/include/compat/freebsd/alloca.h
-+++ b/3rdparty/bx/include/compat/freebsd/alloca.h
-@@ -1 +1,5 @@
-+#ifdef __GLIBC__
-+#include_next <alloca.h>
-+#else
- #include <stdlib.h>
-+#endif
-diff --git a/3rdparty/bx/include/compat/freebsd/signal.h b/3rdparty/bx/include/compat/freebsd/signal.h
-index fd7d90f..3040b56 100644
---- a/3rdparty/bx/include/compat/freebsd/signal.h
-+++ b/3rdparty/bx/include/compat/freebsd/signal.h
-@@ -1 +1,5 @@
-+#ifdef __GLIBC__
-+#include_next <signal.h>
-+#else
- #include <sys/signal.h>
-+#endif
-diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
-index 4094e48..ce45034 100644
---- a/scripts/src/osd/sdl.lua
-+++ b/scripts/src/osd/sdl.lua
-@@ -340,7 +340,7 @@ project ("qtdbg_" .. _OPTIONS["osd"])
- MAME_DIR .. "src/osd/modules/render",
- MAME_DIR .. "3rdparty",
- }
-- configuration { "linux-*" }
-+ configuration { "linux-* or freebsd" }
- buildoptions {
- "-fPIC",
- }
-diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
-index 164c2fc..3eab9e4 100644
---- a/src/osd/modules/file/posixptty.cpp
-+++ b/src/osd/modules/file/posixptty.cpp
-@@ -19,7 +19,7 @@
- #include <unistd.h>
- #include <stdlib.h>
-
--#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <termios.h>
- #include <libutil.h>
- #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__)
diff --git a/debian/patches/remove-m64_flag_for_mips64el_alpha.patch b/debian/patches/remove-m64_flag_for_mips64el_alpha.patch
deleted file mode 100644
index 146529b..0000000
--- a/debian/patches/remove-m64_flag_for_mips64el_alpha.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: mame-0.175/makefile
-===================================================================
---- mame-0.175.orig/makefile
-+++ mame-0.175/makefile
-@@ -140,6 +140,12 @@ endif
- ifneq ($(filter %86,$(UNAME_P)),)
- PLATFORM := x86
- endif
-+ifneq ($(filter alpha,$(UNAME_M)),)
-+PLATFORM := alpha
-+endif
-+ifneq ($(filter alpha,$(UNAME_P)),)
-+PLATFORM := alpha
-+endif
- ifneq ($(filter arm%,$(UNAME_M)),)
- PLATFORM := arm
- endif
-@@ -155,6 +161,11 @@ endif
- ifneq ($(filter powerpc,$(UNAME_P)),)
- PLATFORM := powerpc
- endif
-+ifneq ($(filter mips64%,$(UNAME_M)),)
-+ifeq ($(shell getconf LONG_BIT),64)
-+PLATFORM := mips64
-+endif
-+endif
- ifeq ($(firstword $(filter Linux,$(UNAME))),Linux)
- OS := linux
- endif
-Index: mame-0.175/scripts/genie.lua
-===================================================================
---- mame-0.175.orig/scripts/genie.lua
-+++ mame-0.175/scripts/genie.lua
-@@ -982,6 +982,12 @@ end
- end
- end
-
-+if (_OPTIONS["PLATFORM"]=="alpha") then
-+ defines {
-+ "PTR64=1",
-+ }
-+end
-+
- if (_OPTIONS["PLATFORM"]=="arm") then
- buildoptions {
- "-Wno-cast-align",
-@@ -995,6 +1001,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then
- defines {
- "PTR64=1",
- }
-+end
-+
-+if (_OPTIONS["PLATFORM"]=="mips64") then
-+ defines {
-+ "PTR64=1",
-+ }
- end
-
- local subdir
diff --git a/debian/patches/series b/debian/patches/series
index 6180cb4..a465bdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-remove-m64_flag_for_mips64el_alpha.patch
genie_freebsd_target.patch
-kfreebsd.patch
hurd.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git
More information about the Pkg-games-commits
mailing list