[mame] 06/10: New patch: add makefile variable for default ini path

[Cesare Falco]

This is an automated email from the git hooks/post-receive script.

cesarefalco-guest pushed a commit to branch master
in repository mame.

commit 7560885041a2267e57556ee76444aa4791065e55
Author: Cesare Falco <c.falco at ubuntu.com>
Date:   Sat May 30 09:48:20 2015 +0200

    New patch: add makefile variable for default ini path
---
 debian/patches/add_sdl_ini_path_variable.patch | 55 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 debian/rules                                   |  2 +-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/debian/patches/add_sdl_ini_path_variable.patch b/debian/patches/add_sdl_ini_path_variable.patch
new file mode 100644
index 0000000..4548f16
--- /dev/null
+++ b/debian/patches/add_sdl_ini_path_variable.patch
@@ -0,0 +1,55 @@
+Index: mame/scripts/src/osd/sdl_cfg.lua
+===================================================================
+--- mame.orig/scripts/src/osd/sdl_cfg.lua	2015-05-28 06:45:50.064834000 +0200
++++ mame/scripts/src/osd/sdl_cfg.lua	2015-05-28 06:45:50.036834000 +0200
+@@ -18,6 +18,11 @@
+ 	}
+ end
+ 
++if _OPTIONS["SDL_INI_PATH"]~=nil then
++    defines {
++        "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
++    }
++end
+ 
+ if _OPTIONS["NO_X11"]=="1" then
+ 	defines {
+Index: mame/makefile
+===================================================================
+--- mame.orig/makefile	2015-05-28 06:45:50.064834000 +0200
++++ mame/makefile	2015-05-28 06:45:50.036834000 +0200
+@@ -29,6 +29,7 @@
+ # USE_DISPATCH_GL = 0
+ # DIRECTINPUT = 7
+ # USE_SDL = 1
++# SDL_INI_PATH = .;$HOME/.mame/;ini;
+ # SDL2_MULTIAPI = 1
+ # NO_USE_MIDI = 1
+ # DONT_USE_NETWORK = 1
+@@ -467,6 +468,10 @@
+ PARAMS += --USE_SDL='$(USE_SDL)'
+ endif
+ 
++ifdef SDL_INI_PATH
++PARAMS += --SDL_INI_PATH='$(SDL_INI_PATH)'
++endif
++
+ ifdef CYGWIN_BUILD
+ PARAMS += --CYGWIN_BUILD='$(CYGWIN_BUILD)'
+ endif
+Index: mame/scripts/src/osd/sdl.lua
+===================================================================
+--- mame.orig/scripts/src/osd/sdl.lua	2015-05-28 06:45:50.064834000 +0200
++++ mame/scripts/src/osd/sdl.lua	2015-05-28 06:45:50.040834000 +0200
+@@ -102,6 +102,11 @@
+ }
+ 
+ newoption {
++    trigger = "SDL_INI_PATH",
++    description = "Default search path for .ini files",
++}
++
++newoption {
+ 	trigger = "NO_X11",
+ 	description = "Disable use of X11",
+ 	allowed = {
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2306af7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add_sdl_ini_path_variable.patch
diff --git a/debian/rules b/debian/rules
index b881b9c..fb18ef0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ DEB_OPTS += \
 endif
 
 DEB_MAME_OPTS = \
-    OPT_FLAGS="-D'INI_PATH=\"/etc/mame\"'" \
+    SDL_INI_PATH=/etc/mame \
     FULLNAME=mame \
     TARGET=mame \
     SUBTARGET=mame \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git