[mame] 01/02: Updated patches to new source tree
Cesare Falco
cesarefalco-guest at moszumanska.debian.org
Wed Nov 30 22:30:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
cesarefalco-guest pushed a commit to branch master
in repository mame.
commit 10031f27d4f6086d2baa2f066ff93b4ac8a468f7
Author: Cesare Falco <c.falco at ubuntu.com>
Date: Wed Nov 30 16:21:07 2016 +0100
Updated patches to new source tree
---
debian/patches/genie_freebsd_target.patch | 2 +-
debian/patches/hurd.patch | 19 +++----------------
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/debian/patches/genie_freebsd_target.patch b/debian/patches/genie_freebsd_target.patch
index b0b8e96..36180c7 100644
--- a/debian/patches/genie_freebsd_target.patch
+++ b/debian/patches/genie_freebsd_target.patch
@@ -6,7 +6,7 @@ Index: mame-0.175/makefile
===================================================================
--- mame-0.175.orig/makefile
+++ mame-0.175/makefile
-@@ -179,19 +179,19 @@ GENIEOS := solaris
+@@ -178,19 +178,19 @@ GENIEOS := solaris
endif
ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
OS := freebsd
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index cfff186..4c2d793 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -6,7 +6,7 @@ Index: mame-0.178/makefile
===================================================================
--- mame-0.178.orig/makefile
+++ mame-0.178/makefile
-@@ -193,6 +193,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA
+@@ -192,6 +192,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA
OS := openbsd
GENIEOS := bsd
endif
@@ -16,7 +16,7 @@ Index: mame-0.178/makefile
ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
OS := macosx
GENIEOS := darwin
-@@ -1180,6 +1183,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
+@@ -1233,6 +1236,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
@@ -104,7 +104,7 @@ Index: mame-0.178/scripts/genie.lua
===================================================================
--- mame-0.178.orig/scripts/genie.lua
+++ mame-0.178/scripts/genie.lua
-@@ -125,6 +125,7 @@ newoption {
+@@ -129,6 +129,7 @@ newoption {
{ "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
@@ -125,16 +125,3 @@ Index: mame-0.178/src/osd/modules/render/drawbgfx.cpp
return (void*)wmi.info.x11.window;
# elif BX_PLATFORM_OSX
return wmi.info.cocoa.window;
-Index: mame-0.178/3rdparty/bx/include/bx/os.h
-===================================================================
---- mame-0.178.orig/3rdparty/bx/include/bx/os.h
-+++ mame-0.178/3rdparty/bx/include/bx/os.h
-@@ -49,7 +49,7 @@
- # elif BX_PLATFORM_OSX
- # include <mach/mach.h> // mach_task_basic_info
- # elif BX_PLATFORM_HURD
--# include <unistd.h> // getpid
-+# include <pthread/pthread.h> // getpid
- # elif BX_PLATFORM_ANDROID
- # include "debug.h" // getTid is not implemented...
- # endif // BX_PLATFORM_ANDROID
--
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