[mame] 01/01: Refresh patches
Cesare Falco
cesarefalco-guest at moszumanska.debian.org
Fri Jan 27 15:18:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
cesarefalco-guest pushed a commit to branch master
in repository mame.
commit 64ee1ac238ef009679daece635ede6135ed142e0
Author: Cesare Falco <c.falco at ubuntu.com>
Date: Fri Jan 27 16:16:52 2017 +0100
Refresh patches
---
debian/patches/genie_freebsd_target.patch | 24 ++++++++++++------------
debian/patches/hurd.patch | 6 +++---
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/debian/patches/genie_freebsd_target.patch b/debian/patches/genie_freebsd_target.patch
index 36180c7..491193e 100644
--- a/debian/patches/genie_freebsd_target.patch
+++ b/debian/patches/genie_freebsd_target.patch
@@ -2,11 +2,11 @@ Author: Jordi Mallach <jordi at debian.org>
Description: Hack around genie to make kfreebsd builds work.
Forwarded: no
-Index: mame-0.175/makefile
+Index: mame/makefile
===================================================================
---- mame-0.175.orig/makefile
-+++ mame-0.175/makefile
-@@ -178,19 +178,19 @@ GENIEOS := solaris
+--- mame.orig/makefile
++++ mame/makefile
+@@ -179,19 +179,19 @@ GENIEOS := solaris
endif
ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
OS := freebsd
@@ -30,10 +30,10 @@ Index: mame-0.175/makefile
endif
ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
OS := macosx
-Index: mame-0.175/3rdparty/genie/build/gmake.bsd/Makefile
+Index: mame/3rdparty/genie/build/gmake.bsd/Makefile
===================================================================
--- /dev/null
-+++ mame-0.175/3rdparty/genie/build/gmake.bsd/Makefile
++++ mame/3rdparty/genie/build/gmake.bsd/Makefile
@@ -0,0 +1,34 @@
+# GNU Make solution makefile autogenerated by GENie
+# Type "make help" for usage help
@@ -69,10 +69,10 @@ Index: mame-0.175/3rdparty/genie/build/gmake.bsd/Makefile
+ @echo " genie"
+ @echo ""
+ @echo "For more information, see https://github.com/bkaradzic/genie"
-Index: mame-0.175/3rdparty/genie/build/gmake.bsd/genie.make
+Index: mame/3rdparty/genie/build/gmake.bsd/genie.make
===================================================================
--- /dev/null
-+++ mame-0.175/3rdparty/genie/build/gmake.bsd/genie.make
++++ mame/3rdparty/genie/build/gmake.bsd/genie.make
@@ -0,0 +1,459 @@
+# GNU Make project makefile autogenerated by GENie
+ifndef config
@@ -533,9 +533,9 @@ Index: mame-0.175/3rdparty/genie/build/gmake.bsd/genie.make
+ifneq (,$(PCH))
+ -include $(OBJDIR)/$(notdir $(PCH)).d
+endif
-Index: mame-0.175/3rdparty/genie/build/gmake.freebsd/Makefile
+Index: mame/3rdparty/genie/build/gmake.freebsd/Makefile
===================================================================
---- mame-0.175.orig/3rdparty/genie/build/gmake.freebsd/Makefile
+--- mame.orig/3rdparty/genie/build/gmake.freebsd/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# GNU Make solution makefile autogenerated by GENie
@@ -572,9 +572,9 @@ Index: mame-0.175/3rdparty/genie/build/gmake.freebsd/Makefile
- @echo " genie"
- @echo ""
- @echo "For more information, see https://github.com/bkaradzic/genie"
-Index: mame-0.175/3rdparty/genie/build/gmake.freebsd/genie.make
+Index: mame/3rdparty/genie/build/gmake.freebsd/genie.make
===================================================================
---- mame-0.175.orig/3rdparty/genie/build/gmake.freebsd/genie.make
+--- mame.orig/3rdparty/genie/build/gmake.freebsd/genie.make
+++ /dev/null
@@ -1,459 +0,0 @@
-# GNU Make project makefile autogenerated by GENie
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index b2af45f..c7b3fa9 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -6,7 +6,7 @@ Index: mame/makefile
===================================================================
--- mame.orig/makefile
+++ mame/makefile
-@@ -192,6 +192,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA
+@@ -193,6 +193,9 @@ ifeq ($(firstword $(filter OpenBSD,$(UNA
OS := openbsd
GENIEOS := bsd
endif
@@ -16,7 +16,7 @@ Index: mame/makefile
ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
OS := macosx
GENIEOS := darwin
-@@ -1241,6 +1244,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
+@@ -1247,6 +1250,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
@@ -37,7 +37,7 @@ Index: mame/scripts/src/osd/sdl.lua
===================================================================
--- mame.orig/scripts/src/osd/sdl.lua
+++ mame/scripts/src/osd/sdl.lua
-@@ -228,6 +228,9 @@ if _OPTIONS["targetos"]=="linux" then
+@@ -229,6 +229,9 @@ if _OPTIONS["targetos"]=="linux" then
elseif _OPTIONS["targetos"]=="openbsd" then
elseif _OPTIONS["targetos"]=="netbsd" then
SDL_NETWORK = "pcap"
--
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