This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 1b7f1c8372e94e36ab4eb3a0d86ee782f323cddf Author: Jordi Mallach <[email protected]> Date: Fri Jul 22 01:17:55 2016 +0200 Add hurd.patch with some fixes to the build on hurd-i386 systems. --- debian/changelog | 1 + debian/patches/hurd.patch | 123 ++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 10 ++++ 4 files changed, 135 insertions(+) diff --git a/debian/changelog b/debian/changelog index 87044d1..a4a00ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ mame (0.175-2) unstable; urgency=medium their -arch variants. * Add kfreebsd.patch to solve a lot more build issues on kfreebsd-*. Many thanks to Steven Chamberlain! + * Add hurd.patch with some fixes to the build on hurd-i386 systems. -- Cesare Falco <[email protected]> Fri, 08 Jul 2016 13:08:40 +0200 diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch new file mode 100644 index 0000000..fbe0d84 --- /dev/null +++ b/debian/patches/hurd.patch @@ -0,0 +1,123 @@ +Index: mame-0.175/makefile +=================================================================== +--- mame-0.175.orig/makefile ++++ mame-0.175/makefile +@@ -193,6 +193,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA + OS := openbsd + GENIEOS := bsd + endif ++ifeq ($(firstword $(filter GNU,$(UNAME))),GNU) ++OS := gnu ++endif + ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin) + OS := macosx + GENIEOS := darwin +Index: mame-0.175/scripts/src/osd/sdl.lua +=================================================================== +--- mame-0.175.orig/scripts/src/osd/sdl.lua ++++ mame-0.175/scripts/src/osd/sdl.lua +@@ -228,6 +228,9 @@ if _OPTIONS["targetos"]=="linux" then + elseif _OPTIONS["targetos"]=="openbsd" then + elseif _OPTIONS["targetos"]=="netbsd" then + SDL_NETWORK = "pcap" ++elseif _OPTIONS["targetos"]=="gnu" then ++ SDL_NETWORK = "taptun" ++ SYNC_IMPLEMENTATION = "tc" + elseif _OPTIONS["targetos"]=="haiku" then + elseif _OPTIONS["targetos"]=="asmjs" then + elseif _OPTIONS["targetos"]=="windows" then +Index: mame-0.175/src/osd/sdl/sdlprefix.h +=================================================================== +--- mame-0.175.orig/src/osd/sdl/sdlprefix.h ++++ mame-0.175/src/osd/sdl/sdlprefix.h +@@ -41,7 +41,7 @@ + /* Large file support on IRIX needs _SGI_SOURCE */ + #undef _POSIX_SOURCE + +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) ++#elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) + #define SDLMAME_LINUX 1 + + #elif defined(__FreeBSD__) +Index: mame-0.175/3rdparty/genie/src/host/premake.h +=================================================================== +--- 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 +@@ -37,6 +37,12 @@ + #endif + #endif + ++#if defined(__GNU__) ++#ifndef PATH_MAX ++#define PATH_MAX 1024 ++#endif ++#endif ++ + // MAME headers + #include "posixfile.h" + +Index: mame-0.175/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 +@@ -27,10 +27,18 @@ + #include <util.h> + #elif defined(__linux__) || defined(EMSCRIPTEN) + #include <pty.h> ++#elif defined(__GNU__) ++#include <pty.h> ++#include <termios.h> + #elif defined(__HAIKU__) + #include <bsd/pty.h> + #endif + ++#if defined(__GNU__) ++#ifndef PATH_MAX ++#define PATH_MAX 1024 ++#endif ++#endif + + namespace { + #if defined(__APPLE__) +Index: mame-0.175/scripts/genie.lua +=================================================================== +--- mame-0.175.orig/scripts/genie.lua ++++ mame-0.175/scripts/genie.lua +@@ -117,6 +117,7 @@ newoption { + { "freebsd", "FreeBSD" }, + { "netbsd", "NetBSD" }, + { "openbsd", "OpenBSD" }, ++ { "gnu", "GNU" }, + { "pnacl", "Native Client - PNaCl" }, + { "linux", "Linux" }, + { "ios", "iOS" }, +Index: mame-0.175/3rdparty/luafilesystem/src/lfs.c +=================================================================== +--- 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 + ++#ifdef __GNU__ ++#ifndef MAXPATHLEN ++#define MAXPATHLEN 1024 ++#endif ++#endif ++ + #include <lua.h> + #include <lauxlib.h> + #include <lualib.h> diff --git a/debian/patches/series b/debian/patches/series index 4a70cfb..6180cb4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ remove-m64_flag_for_mips64el_alpha.patch genie_freebsd_target.patch kfreebsd.patch +hurd.patch diff --git a/debian/rules b/debian/rules index 30284a0..e47c515 100755 --- a/debian/rules +++ b/debian/rules @@ -152,6 +152,16 @@ DEB_OPTS += \ export DEB_LDFLAGS_MAINT_APPEND = -ldl endif +# GNU/Hurd architecture +ifeq ($(DEB_HOST_ARCH),hurd-i386) +DEB_OPTS += \ + TARGETOS=gnu \ + FORCE_DRC_C_BACKEND= \ + NOASM= \ + USE_SYSTEM_LIB_PORTMIDI= \ + NO_USE_MIDI=1 +endif + # Enable full building log when verbose output required ifdef DH_VERBOSE DEB_OPTS += VERBOSE=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
