This is an automated email from the git hooks/post-receive script. cesarefalco-guest pushed a commit to branch master in repository mame.
commit 8104e14ad68cc6505b6641d5552952f48fa1cdd9 Author: Cesare Falco <[email protected]> Date: Fri Jul 31 16:51:54 2015 +0200 Removed default ini path variable (patch accepted upstream) --- debian/patches/add_sdl_ini_path_variable.patch | 55 -------------------------- debian/patches/series | 1 - 2 files changed, 56 deletions(-) diff --git a/debian/patches/add_sdl_ini_path_variable.patch b/debian/patches/add_sdl_ini_path_variable.patch deleted file mode 100644 index 4548f16..0000000 --- a/debian/patches/add_sdl_ini_path_variable.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 2306af7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -add_sdl_ini_path_variable.patch -- 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
