This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit c2ffadf6f31db5a1606c2be4e701cdcc40bd7038 Author: Jordi Mallach <[email protected]> Date: Wed Jan 25 18:47:21 2017 +0100 Avoid compiling in linenoise, for licensing reasons. --- debian/changelog | 2 + debian/patches/avoid_linenoise.patch | 79 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 4 files changed, 83 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5d1efc1..bcb1924 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ mame (0.182-1) UNRELEASED; urgency=medium kFreeBSD builds (thanks Steven Chamberlain; closes: #852507). * Drop ConvertUTF.* from the tarball as it is under the Unicode non-free license. + * Add avoid_linenoise.patch: define NO_USE_LINENOISE and guard uses of + linenoise code with it, to avoid the need to compile 3rdparty/linenoise. -- Jordi Mallach <[email protected]> Wed, 25 Jan 2017 13:03:04 +0100 diff --git a/debian/patches/avoid_linenoise.patch b/debian/patches/avoid_linenoise.patch new file mode 100644 index 0000000..8d800dd --- /dev/null +++ b/debian/patches/avoid_linenoise.patch @@ -0,0 +1,79 @@ +Author: Jordi Mallach <[email protected]> +Description: avoid compiling linenoise, that includes the non-free file + ConvertUTF.cpp. + +Index: mame/makefile +=================================================================== +--- mame.orig/makefile ++++ mame/makefile +@@ -779,6 +779,10 @@ endif + ifdef WEBASSEMBLY + PARAMS += --WEBASSEMBLY='$(WEBASSEMBLY)' + endif ++ ++ifdef NO_USE_LINENOISE ++PARAMS += --NO_USE_LINENOISE=1 ++endif + #------------------------------------------------- + # All scripts + #------------------------------------------------- +Index: mame/scripts/genie.lua +=================================================================== +--- mame.orig/scripts/genie.lua ++++ mame/scripts/genie.lua +@@ -388,6 +388,11 @@ newoption { + } + + newoption { ++ trigger = "NO_USE_LINENOISE", ++ description = "Avoid using linenoise for licensing reasons.", ++} ++ ++newoption { + trigger = "PROJECT", + description = "Select projects to be built. Will look into project folder for files.", + } +Index: mame/scripts/src/3rdparty.lua +=================================================================== +--- mame.orig/scripts/src/3rdparty.lua ++++ mame/scripts/src/3rdparty.lua +@@ -572,7 +572,7 @@ project "lualibs" + includedirs { + MAME_DIR .. "3rdparty", + } +-if (_OPTIONS["osd"] ~= "uwp") then ++if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then + includedirs { + MAME_DIR .. "3rdparty/linenoise-ng/include", + } +@@ -595,7 +595,7 @@ end + MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", + MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", + } +-if (_OPTIONS["osd"] == "uwp") then ++if (_OPTIONS["osd"] == "uwp") or (_OPTIONS["NO_USE_LINENOISE"]) then + files { + MAME_DIR .. "3rdparty/lua-linenoise/linenoise_none.c", + } +@@ -1572,7 +1572,7 @@ end + -------------------------------------------------- + -- linenoise-ng library + -------------------------------------------------- +-if (_OPTIONS["osd"] ~= "uwp") then ++if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then + project "linenoise-ng" + uuid "7320ffc8-2748-4add-8864-ae29b72a8511" + kind (LIBTYPE) +Index: mame/scripts/src/main.lua +=================================================================== +--- mame.orig/scripts/src/main.lua ++++ mame/scripts/src/main.lua +@@ -267,7 +267,7 @@ if (STANDALONE~=true) then + ext_lib("lua"), + "lualibs", + } +-if (_OPTIONS["osd"] ~= "uwp") then ++if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then + links { + "linenoise-ng", + } diff --git a/debian/patches/series b/debian/patches/series index 433d76d..7db7f2b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ hurd.patch sphinx_mathjax_location.patch m68000_archopts.patch kfreebsd_dirent.h_path.patch +avoid_linenoise.patch diff --git a/debian/rules b/debian/rules index 3edd134..04f7af8 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,7 @@ DEB_OPTS = \ PTR64= \ BIGENDIAN= \ NOASM=1 \ + NO_USE_LINENOISE=1 \ QT_HOME=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \ USE_SYSTEM_LIB_EXPAT=1 \ USE_SYSTEM_LIB_ZLIB=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
