rpms/mame/devel mame-optflags.patch, NONE, 1.1 mame-systemlibs.patch, 1.7, 1.8 .cvsignore, 1.87, 1.88 mame-fortify.patch, 1.1, 1.2 mame.spec, 1.103, 1.104 sources, 1.87, 1.88 mame-verbosebuild.patch, 1.9, NONE
Julian Sikorski
belegdol at rpmfusion.org
Mon Jun 8 07:36:01 CEST 2015
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7866
Modified Files:
.cvsignore mame-fortify.patch mame.spec sources
Added Files:
mame-optflags.patch mame-systemlibs.patch
Removed Files:
mame-verbosebuild.patch
Log Message:
* Sun Jun 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.162-1
- Updated to 0.162
- Adapted to the new build system
- Cleaned up the .spec file considerably
mame-optflags.patch:
makefile | 5 +++++
scripts/genie.lua | 10 ++++++++++
2 files changed, 15 insertions(+)
--- NEW FILE mame-optflags.patch ---
diff -up mame-0.162/makefile.optflags mame-0.162/makefile
--- mame-0.162/makefile.optflags 2015-05-28 23:21:35.868882781 +0200
+++ mame-0.162/makefile 2015-05-28 23:23:02.109830454 +0200
@@ -51,6 +51,7 @@
# MAP = 1
# PROFILE = 1
# ARCHOPTS =
+# OPT_FLAGS =
# LDOPTS =
# USE_SYSTEM_LIB_EXPAT = 1
@@ -399,6 +400,10 @@ ifdef ARCHOPTS
PARAMS += --ARCHOPTS='$(ARCHOPTS)'
endif
+ifdef OPT_FLAGS
+PARAMS += --OPT_FLAGS='$(OPT_FLAGS)'
+endif
+
ifdef MAP
PARAMS += --MAP='$(MAP)'
endif
diff -up mame-0.162/scripts/genie.lua.optflags mame-0.162/scripts/genie.lua
--- mame-0.162/scripts/genie.lua.optflags 2015-05-28 23:21:51.493054469 +0200
+++ mame-0.162/scripts/genie.lua 2015-05-28 23:24:07.232546065 +0200
@@ -164,6 +164,11 @@ newoption {
}
newoption {
+ trigger = "OPT_FLAGS",
+ description = "OPT_FLAGS.",
+}
+
+newoption {
trigger = "LDOPTS",
description = "Additional linker options",
}
@@ -719,6 +724,11 @@ if _OPTIONS["OPTIMIZE"] then
_OPTIONS["ARCHOPTS"]
}
end
+ if _OPTIONS["OPT_FLAGS"] then
+ buildoptions {
+ _OPTIONS["OPT_FLAGS"]
+ }
+ end
if _OPTIONS["LTO"]=="1" then
buildoptions {
"-flto",
mame-systemlibs.patch:
3rdparty/lsqlite3/lsqlite3.c | 4
makefile | 46 +++++
scripts/genie.lua | 66 ++++++++
scripts/src/3rdparty.lua | 54 ++++++
scripts/src/emu.lua | 48 +++++-
scripts/src/lib.lua | 13 +
scripts/src/main.lua | 41 ++++-
scripts/src/tools.lua | 271 +++++++++++++++++++++++++++++++----
scripts/target/ldplayer/ldplayer.lua | 10 -
scripts/target/mame/arcade.lua | 7
scripts/target/mame/dummy.lua | 10 -
scripts/target/mame/mess.lua | 6
scripts/target/mame/tiny.lua | 8 -
src/osd/modules/midi/portmidi.c | 4
14 files changed, 535 insertions(+), 53 deletions(-)
Index: mame-systemlibs.patch
===================================================================
RCS file: mame-systemlibs.patch
diff -N mame-systemlibs.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mame-systemlibs.patch 8 Jun 2015 05:36:01 -0000 1.8
@@ -0,0 +1,1126 @@
+diff -up mame-0.162/3rdparty/lsqlite3/lsqlite3.c.systemlibs mame-0.162/3rdparty/lsqlite3/lsqlite3.c
+--- mame-0.162/3rdparty/lsqlite3/lsqlite3.c.systemlibs 2015-06-06 13:13:13.023290596 +0200
++++ mame-0.162/3rdparty/lsqlite3/lsqlite3.c 2015-06-06 13:13:25.068444984 +0200
+@@ -47,7 +47,11 @@
+ #define luaL_openlib(L,name,reg,nup) luaL_setfuncs(L,reg,nup)
+ #endif
+
++#ifndef USE_SYSTEM_SQLITE
+ #include "sqlite3/sqlite3.h"
++#else
++#include <sqlite3.h>
++#endif
+
+ /* compile time features */
+ #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
+diff -up mame-0.162/makefile.systemlibs mame-0.162/makefile
+--- mame-0.162/makefile.systemlibs 2015-06-06 13:13:25.022444395 +0200
++++ mame-0.162/makefile 2015-06-06 13:13:25.068444984 +0200
+@@ -55,6 +55,14 @@
+ # LDOPTS =
+
+ # USE_SYSTEM_LIB_EXPAT = 1
++# USE_SYSTEM_LIB_ZLIB = 1
++# USE_SYSTEM_LIB_JPEG = 1
++# USE_SYSTEM_LIB_FLAC = 1
++# USE_SYSTEM_LIB_LUA = 1
++# USE_SYSTEM_LIB_MONGOOSE = 1
++# USE_SYSTEM_LIB_JSONCPP = 1
++# USE_SYSTEM_LIB_SQLITE3 = 1
++# USE_SYSTEM_LIB_PORTMIDI = 1
+
+ # MESA_INSTALL_ROOT = /opt/mesa
+ # SDL_INSTALL_ROOT = /opt/sdl2
+@@ -296,6 +304,38 @@ ifndef USE_SYSTEM_LIB_EXPAT
+ PARAMS += --with-bundled-expat
+ endif
+
++ifndef USE_SYSTEM_LIB_ZLIB
++PARAMS += --with-bundled-zlib
++endif
++
++ifndef USE_SYSTEM_LIB_JPEG
++PARAMS += --with-bundled-jpeg
++endif
++
++ifndef USE_SYSTEM_LIB_FLAC
++PARAMS += --with-bundled-flac
++endif
++
++ifndef USE_SYSTEM_LIB_LUA
++PARAMS += --with-bundled-lua
++endif
++
++ifndef USE_SYSTEM_LIB_MONGOOSE
++PARAMS += --with-bundled-mongoose
++endif
++
++ifndef USE_SYSTEM_LIB_JSONCPP
++PARAMS += --with-bundled-jsoncpp
++endif
++
++ifndef USE_SYSTEM_LIB_SQLITE3
++PARAMS += --with-bundled-sqlite3
++endif
++
++ifndef USE_SYSTEM_LIB_PORTMIDI
++PARAMS += --with-bundled-portmidi
++endif
++
+ #-------------------------------------------------
+ # distribution may change things
+ #-------------------------------------------------
+@@ -1042,8 +1082,12 @@ CPPCHECK_PARAMS += -Isrc/osd/modules/ren
+ CPPCHECK_PARAMS += -Isrc/osd/windows
+ CPPCHECK_PARAMS += -Isrc/emu/cpu/m68000
+ CPPCHECK_PARAMS += -I3rdparty
++ifndef USE_SYSTEM_LIB_LUA
+ CPPCHECK_PARAMS += -I3rdparty/lua/src
++endif
++ifndef USE_SYSTEM_LIB_ZLIB
+ CPPCHECK_PARAMS += -I3rdparty/zlib
++endif
+ CPPCHECK_PARAMS += -I3rdparty/bgfx/include
+ CPPCHECK_PARAMS += -I3rdparty/bx/include
+ CPPCHECK_PARAMS += -Ibuild/generated/emu
+@@ -1056,7 +1100,9 @@ CPPCHECK_PARAMS += -DMAME_DEBUG
+ CPPCHECK_PARAMS += -DMAME_PROFILER
+ CPPCHECK_PARAMS += -DCRLF=3
+ CPPCHECK_PARAMS += -DLSB_FIRST
++ifndef USE_SYSTEM_LIB_FLAC
+ CPPCHECK_PARAMS += -DFLAC__NO_DLL
++endif
+ CPPCHECK_PARAMS += -DNATIVE_DRC=drcbe_x64
+ CPPCHECK_PARAMS += -DLUA_COMPAT_APIINTCASTS
+ CPPCHECK_PARAMS += -DWIN32
+diff -up mame-0.162/scripts/genie.lua.systemlibs mame-0.162/scripts/genie.lua
+--- mame-0.162/scripts/genie.lua.systemlibs 2015-06-06 13:13:25.022444395 +0200
++++ mame-0.162/scripts/genie.lua 2015-06-06 13:13:25.069444997 +0200
+@@ -94,6 +94,46 @@ newoption {
+ }
+
+ newoption {
++ trigger = 'with-bundled-zlib',
++ description = 'Build bundled Zlib library',
++}
++
++newoption {
++ trigger = 'with-bundled-jpeg',
++ description = 'Build bundled JPEG library',
++}
++
++newoption {
++ trigger = 'with-bundled-flac',
++ description = 'Build bundled FLAC library',
++}
++
++newoption {
++ trigger = 'with-bundled-lua',
++ description = 'Build bundled LUA library',
++}
++
++newoption {
++ trigger = 'with-bundled-mongoose',
++ description = 'Build bundled Mongoose library',
++}
++
++newoption {
++ trigger = 'with-bundled-jsoncpp',
++ description = 'Build bundled JsonCpp library',
++}
++
++newoption {
++ trigger = 'with-bundled-sqlite3',
++ description = 'Build bundled SQLite library',
++}
++
++newoption {
++ trigger = 'with-bundled-portmidi',
++ description = 'Build bundled PortMidi library',
++}
++
++newoption {
+ trigger = "distro",
+ description = "Choose distribution",
+ allowed = {
+@@ -576,9 +616,29 @@ else
+ end
+
+ -- need to ensure FLAC functions are statically linked
+-defines {
+- "FLAC__NO_DLL",
+-}
++if _OPTIONS["with-bundled-flac"] then
++ defines {
++ "FLAC__NO_DLL",
++ }
++ end
++
++if not _OPTIONS["with-bundled-jpeg"] then
++ defines {
++ "USE_SYSTEM_JPEGLIB",
++ }
++ end
++
++if not _OPTIONS["with-bundled-portmidi"] then
++ defines {
++ "USE_SYSTEM_PORTMIDI",
++ }
++ end
++
++if not _OPTIONS["with-bundled-sqlite3"] then
++ defines {
++ "USE_SYSTEM_SQLITE",
++ }
++ end
+
+ if _OPTIONS["NOASM"]=="1" then
+ defines {
+diff -up mame-0.162/scripts/src/3rdparty.lua.systemlibs mame-0.162/scripts/src/3rdparty.lua
+--- mame-0.162/scripts/src/3rdparty.lua.systemlibs 2015-06-06 13:12:35.040819170 +0200
++++ mame-0.162/scripts/src/3rdparty.lua 2015-06-06 13:13:25.069444997 +0200
+@@ -34,6 +34,7 @@ end
+ -- zlib library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-zlib"] then
+ project "zlib"
+ uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9"
+ kind "StaticLib"
+@@ -71,6 +72,11 @@ project "zlib"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "z",
++}
++end
+
+ --------------------------------------------------
+ -- SoftFloat library objects
+@@ -112,6 +118,7 @@ project "softfloat"
+ -- libJPEG library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-jpeg"] then
+ project "jpeg"
+ uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca"
+ kind "StaticLib"
+@@ -169,11 +176,17 @@ project "jpeg"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "jpeg",
++}
++end
+
+ --------------------------------------------------
+ -- libflac library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-flac"] then
+ project "flac"
+ uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a"
+ kind "StaticLib"
+@@ -223,6 +236,11 @@ project "flac"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "FLAC",
++}
++end
+
+ --------------------------------------------------
+ -- lib7z library objects
+@@ -268,6 +286,7 @@ project "7z"
+ -- LUA library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-lua"] then
+ project "lua"
+ uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9"
+ kind "StaticLib"
+@@ -342,6 +361,11 @@ project "lua"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "lua",
++}
++end
+
+ --------------------------------------------------
+ -- sqlite3 lua library objects
+@@ -362,8 +386,12 @@ project "lsqlite3"
+
+ includedirs {
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/lua/src",
+ }
++ if _OPTIONS["with-bundled-lua"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/lua/src",
++ }
++ end
+
+ files {
+ MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
+@@ -378,6 +406,7 @@ project "lsqlite3"
+ -- mongoose library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-mongoose"] then
+ project "mongoose"
+ uuid "ff05b529-2b6f-4166-9dff-5fe2aef89c40"
+ kind "StaticLib"
+@@ -402,11 +431,17 @@ project "mongoose"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "mongoose",
++}
++end
+
+ --------------------------------------------------
+ -- jsoncpp library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-jsoncpp"] then
+ project "jsoncpp"
+ uuid "ae023ff3-d712-4e54-adc5-3b56a148650f"
+ kind "StaticLib"
+@@ -430,11 +465,17 @@ project "jsoncpp"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "jsoncpp",
++}
++end
+
+ --------------------------------------------------
+ -- SQLite3 library objects
+ --------------------------------------------------
+
++if _OPTIONS["with-bundled-sqlite3"] then
+ project "sqllite3"
+ uuid "5cb3d495-57ed-461c-81e5-80dc0857517d"
+ kind "StaticLib"
+@@ -455,11 +496,17 @@ project "sqllite3"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "sqlite3",
++}
++end
+
+ --------------------------------------------------
+ -- portmidi library objects
+ --------------------------------------------------
+ if _OPTIONS["NO_USE_MIDI"]~="1" then
++if _OPTIONS["with-bundled-portmidi"] then
+ project "portmidi"
+ uuid "587f2da6-3274-4a65-86a2-f13ea315bb98"
+ kind "StaticLib"
+@@ -514,6 +561,11 @@ project "portmidi"
+ "-Wshadow"
+ }
+ end
++else
++links {
++ "portmidi",
++}
++end
+ end
+ --------------------------------------------------
+ -- BGFX library objects
+diff -up mame-0.162/scripts/src/emu.lua.systemlibs mame-0.162/scripts/src/emu.lua
+--- mame-0.162/scripts/src/emu.lua.systemlibs 2015-06-06 13:12:35.068819470 +0200
++++ mame-0.162/scripts/src/emu.lua 2015-06-06 13:13:25.070445010 +0200
+@@ -14,8 +14,6 @@ includedirs {
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/lua/src",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "emu",
+ GEN_DIR .. "emu/layout",
+ }
+@@ -24,6 +22,16 @@ if _OPTIONS["with-bundled-expat"] then
+ MAME_DIR .. "3rdparty/expat/lib",
+ }
+ end
++if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++end
++if _OPTIONS["with-bundled-lua"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/lua/src",
++ }
++end
+
+ files {
+ MAME_DIR .. "src/emu/emu.h",
+@@ -372,8 +380,6 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/lua/src",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "emu",
+ GEN_DIR .. "emu/layout",
+ MAME_DIR .. "src/emu/cpu/m68000",
+@@ -383,6 +389,16 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "3rdparty/expat/lib",
+ }
+ end
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
++ if _OPTIONS["with-bundled-lua"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/lua/src",
++ }
++ end
+
+ dofile(path.join("src", "cpu.lua"))
+
+@@ -410,8 +426,6 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/lua/src",
+- MAME_DIR .. "3rdparty/zlib",
+ MAME_DIR .. "src/mess", -- some mess bus devices need this
+ MAME_DIR .. "src/mame", -- used for nes bus devices
+ GEN_DIR .. "emu",
+@@ -422,6 +436,16 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "3rdparty/expat/lib",
+ }
+ end
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
++ if _OPTIONS["with-bundled-lua"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/lua/src",
++ }
++ end
+
+ dofile(path.join("src", "bus.lua"))
+
+@@ -440,8 +464,6 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/lua/src",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "emu",
+ }
+ if _OPTIONS["with-bundled-expat"] then
+@@ -449,6 +471,16 @@ function emuProject(_target, _subtarget)
+ MAME_DIR .. "3rdparty/expat/lib",
+ }
+ end
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
++ if _OPTIONS["with-bundled-lua"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/lua/src",
++ }
++ end
+
+ files {
+ disasm_files
+diff -up mame-0.162/scripts/src/lib.lua.systemlibs mame-0.162/scripts/src/lib.lua
+--- mame-0.162/scripts/src/lib.lua.systemlibs 2015-06-06 13:12:35.066819449 +0200
++++ mame-0.162/scripts/src/lib.lua 2015-06-06 13:13:25.070445010 +0200
+@@ -13,13 +13,17 @@ project "utils"
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ }
+ if _OPTIONS["with-bundled-expat"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/expat/lib",
+ }
+ end
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
+
+ files {
+ MAME_DIR .. "src/lib/util/bitstream.h",
+@@ -108,9 +112,14 @@ project "formats"
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ }
+
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
++
+ files {
+ MAME_DIR .. "src/lib/formats/cassimg.c",
+ MAME_DIR .. "src/lib/formats/cassimg.h",
+diff -up mame-0.162/scripts/src/main.lua.systemlibs mame-0.162/scripts/src/main.lua
+--- mame-0.162/scripts/src/main.lua.systemlibs 2015-06-06 13:12:35.060819385 +0200
++++ mame-0.162/scripts/src/main.lua 2015-06-06 13:13:25.070445010 +0200
+@@ -94,16 +94,44 @@ function mainProject(_target, _subtarget
+ "expat",
+ "softfloat",
+ "jpeg",
+- "flac",
+ "7z",
+ "formats",
+ "lua",
+ "lsqlite3",
+- "sqllite3",
+- "zlib",
+ "jsoncpp",
+ "mongoose",
+ }
++
++ if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++ else
++ links {
++ "z",
++ }
++ end
++
++ if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++ else
++ links {
++ "FLAC",
++ }
++ end
++
++ if _OPTIONS["with-bundled-sqlite3"] then
++ links {
++ "sqllite3",
++ }
++ else
++ links {
++ "sqlite3",
++ }
++ end
++
+ if _OPTIONS["NO_USE_MIDI"]~="1" then
+ links {
+ "portmidi",
+@@ -129,11 +157,16 @@ function mainProject(_target, _subtarget
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. _target .. "/layout",
+ GEN_DIR .. "resource",
+ }
+
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
++
+ if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
+ linkoptions {
+ "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist"
+diff -up mame-0.162/scripts/src/tools.lua.systemlibs mame-0.162/scripts/src/tools.lua
+--- mame-0.162/scripts/src/tools.lua.systemlibs 2015-06-06 13:12:35.049819267 +0200
++++ mame-0.162/scripts/src/tools.lua 2015-06-06 13:13:25.071445023 +0200
+@@ -24,10 +24,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -60,12 +69,30 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -100,10 +127,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -138,12 +174,30 @@ links {
+ "emu",
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/emu",
+@@ -179,12 +233,30 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -218,12 +290,30 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -257,10 +347,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -293,10 +392,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -329,10 +437,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -365,12 +482,30 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -403,10 +538,19 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -439,12 +583,30 @@ end
+ links {
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+@@ -481,12 +643,30 @@ links {
+ "formats",
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib",
+@@ -522,12 +702,30 @@ links {
+ "emu",
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib",
+@@ -563,20 +761,43 @@ links {
+ "emu",
+ "utils",
+ "expat",
+- "zlib",
+- "flac",
+ "7z",
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ links {
++ "zlib",
++ }
++else
++ links {
++ "z",
++ }
++end
++
++if _OPTIONS["with-bundled-flac"] then
++ links {
++ "flac",
++ }
++else
++ links {
++ "FLAC",
++ }
++end
++
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+- MAME_DIR .. "3rdparty/zlib",
+ MAME_DIR .. "src/mess/tools/imgtool",
+ }
+
++if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++end
++
+ files {
+ MAME_DIR .. "src/mess/tools/imgtool/main.c",
+ MAME_DIR .. "src/mess/tools/imgtool/stream.c",
+diff -up mame-0.162/scripts/target/ldplayer/ldplayer.lua.systemlibs mame-0.162/scripts/target/ldplayer/ldplayer.lua
+--- mame-0.162/scripts/target/ldplayer/ldplayer.lua.systemlibs 2015-06-06 13:12:35.088819684 +0200
++++ mame-0.162/scripts/target/ldplayer/ldplayer.lua 2015-06-06 13:13:25.071445023 +0200
+@@ -68,9 +68,13 @@ function createProjects_ldplayer_ldplaye
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "mame/layout",
+- }
++ }
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
+
+ files{
+ MAME_DIR .. "src/emu/drivers/emudummy.c",
+@@ -89,4 +93,4 @@ function linkProjects_ldplayer_ldplayer(
+ links {
+ "drvldplayer",
+ }
+-end
+\ Brak znaku nowej linii na końcu pliku
++end
+diff -up mame-0.162/scripts/target/mame/arcade.lua.systemlibs mame-0.162/scripts/target/mame/arcade.lua
+--- mame-0.162/scripts/target/mame/arcade.lua.systemlibs 2015-06-06 13:12:35.111819931 +0200
++++ mame-0.162/scripts/target/mame/arcade.lua 2015-06-06 13:13:25.072445036 +0200
+@@ -774,9 +774,14 @@ function createMAMEProjects(_target, _su
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "mame/layout",
+ }
++
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++end
+ end
+
+ function createProjects_mame_arcade(_target, _subtarget)
+diff -up mame-0.162/scripts/target/mame/dummy.lua.systemlibs mame-0.162/scripts/target/mame/dummy.lua
+--- mame-0.162/scripts/target/mame/dummy.lua.systemlibs 2015-06-06 13:12:35.090819706 +0200
++++ mame-0.162/scripts/target/mame/dummy.lua 2015-06-06 13:13:25.072445036 +0200
+@@ -29,9 +29,13 @@ function createProjects_mame_dummy(_targ
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "mess/layout",
+- }
++ }
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
+
+ files{
+ MAME_DIR .. "src/mess/drivers/coleco.c",
+@@ -43,4 +47,4 @@ function linkProjects_mame_dummy(_target
+ links {
+ "mame_dummy",
+ }
+-end
+\ Brak znaku nowej linii na końcu pliku
++end
+diff -up mame-0.162/scripts/target/mame/mess.lua.systemlibs mame-0.162/scripts/target/mame/mess.lua
+--- mame-0.162/scripts/target/mame/mess.lua.systemlibs 2015-06-06 13:12:35.102819834 +0200
++++ mame-0.162/scripts/target/mame/mess.lua 2015-06-06 13:13:25.073445049 +0200
+@@ -874,11 +874,15 @@ function createMESSProjects(_target, _su
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "mess/layout",
+ GEN_DIR .. "mame/layout",
+ MAME_DIR .. "src/emu/cpu/m68000",
+ }
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
+ end
+
+ function createProjects_mame_mess(_target, _subtarget)
+diff -up mame-0.162/scripts/target/mame/tiny.lua.systemlibs mame-0.162/scripts/target/mame/tiny.lua
+--- mame-0.162/scripts/target/mame/tiny.lua.systemlibs 2015-06-06 13:12:35.092819727 +0200
++++ mame-0.162/scripts/target/mame/tiny.lua 2015-06-06 13:13:25.073445049 +0200
+@@ -92,9 +92,13 @@ function createProjects_mame_tiny(_targe
+ MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "3rdparty",
+- MAME_DIR .. "3rdparty/zlib",
+ GEN_DIR .. "mame/layout",
+- }
++ }
++ if _OPTIONS["with-bundled-zlib"] then
++ includedirs {
++ MAME_DIR .. "3rdparty/zlib",
++ }
++ end
+
+ files{
+ MAME_DIR .. "src/mame/machine/ticket.c",
+diff -up mame-0.162/src/osd/modules/midi/portmidi.c.systemlibs mame-0.162/src/osd/modules/midi/portmidi.c
+--- mame-0.162/src/osd/modules/midi/portmidi.c.systemlibs 2015-06-06 13:12:43.991918485 +0200
++++ mame-0.162/src/osd/modules/midi/portmidi.c 2015-06-06 13:13:25.073445049 +0200
+@@ -10,7 +10,11 @@
+
+ #ifndef NO_USE_MIDI
+
++#ifndef USE_SYSTEM_PORTMIDI
+ #include "portmidi/pm_common/portmidi.h"
++#else
++#include <portmidi.h>
++#endif
+ #include "osdcore.h"
+ #include "corealloc.h"
+ #include "modules/osdmodule.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore 29 Mar 2015 19:21:04 -0000 1.87
+++ .cvsignore 8 Jun 2015 05:36:01 -0000 1.88
@@ -1 +1,2 @@
-mame0160s.exe
+mame0162s.exe
+whatsnew.zip
mame-fortify.patch:
sdlprefix.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: mame-fortify.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame-fortify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mame-fortify.patch 7 Apr 2010 20:54:15 -0000 1.1
+++ mame-fortify.patch 8 Jun 2015 05:36:01 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mame-0.137/src/osd/sdl/sdlprefix.h.fortify mame-0.137/src/osd/sdl/sdlprefix.h
---- mame-0.137/src/osd/sdl/sdlprefix.h.fortify 2010-03-21 14:20:41.000000000 +0100
-+++ mame-0.137/src/osd/sdl/sdlprefix.h 2010-03-21 14:21:07.000000000 +0100
-@@ -50,9 +50,9 @@
+diff -up mame-0.161/src/osd/sdl/sdlprefix.h.fortify mame-0.161/src/osd/sdl/sdlprefix.h
+--- mame-0.161/src/osd/sdl/sdlprefix.h.fortify 2015-04-30 22:18:01.031569146 +0200
++++ mame-0.161/src/osd/sdl/sdlprefix.h 2015-04-30 22:21:30.273905638 +0200
+@@ -76,8 +76,8 @@ struct _IO_FILE {}; //_IO_FILE is an op
#endif
// fix for Ubuntu 8.10
@@ -13,4 +13,3 @@
+// #endif
#endif /* SDLMAME_UNIX */
-
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mame.spec 29 Mar 2015 19:21:04 -0000 1.103
+++ mame.spec 8 Jun 2015 05:36:01 -0000 1.104
@@ -5,13 +5,7 @@
%bcond_with debug
%bcond_with simd
-%global baseversion 160
-#global sourceupdate 1
-#global svn 21418
-
-%if 0%{?svn}
-%global svnrelease .%{svn}svn
-%endif
+%global baseversion 162
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -29,24 +23,20 @@
Release: 1%{?svnrelease}%{?dist}
Summary: Multiple Arcade Machine Emulator
-License: MAME License and BSD
+License: MAME License and BSD and GPLv2+ and LGPLv2+ and Public Domain and zlib
URL: http://mamedev.org/
-%if 0%{?svn}
-Source0: %{name}-svn%{svn}.tar.xz
-%else
-Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
-#Source100: whatsnew.zip
-%if 0%{?sourceupdate}
-#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-%endif
-%endif
+Source0: http://mamedev.org/downloader.php?file=%{name}0%{baseversion}/%{name}0%{baseversion}s.exe
+Source100: whatsnew.zip
Patch0: %{name}-fortify.patch
-Patch2: %{name}-verbosebuild.patch
+Patch1: %{name}-optflags.patch
+Patch2: %{name}-systemlibs.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
+#BuildRequires: jsoncpp-devel
BuildRequires: libjpeg-turbo-devel
+BuildRequires: lua-devel
+#BuildRequires: mongoose-devel
%if !0%{?svn}
BuildRequires: p7zip
%endif
@@ -58,7 +48,14 @@
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
+Provides: bundled(bgfx)
+Provides: bundled(bx)
+Provides: bundled(jsoncpp)
Provides: bundled(lzma-sdk) = 9.22
+Provides: bundled(mongoose)
+Provides: mess = %{version}-%{release}
+Obsoletes: mess < 0.160-2
+
%description
MAME stands for Multiple Arcade Machine Emulator. When used in conjunction
@@ -82,6 +79,9 @@
Summary: Additional tools for MAME
Requires: %{name} = %{version}-%{release}
+Provides: mess-tools = %{version}-%{release}
+Obsoletes: mess-tools < 0.160-2
+
%description tools
%{summary}.
@@ -93,34 +93,8 @@
%{summary}.
%endif
-%package -n mess
-Summary: Multi Emulator Super System
-Requires: mess-data = %{version}-%{release}
-
-%if 0%{?fedora} < 18
-Provides: bundled(libjpeg) = 8c
-%endif
-Provides: bundled(lzma-sdk) = 9.22
-
-%description -n mess
-MESS is an acronym that stands for Multi Emulator Super System. MESS will
-more or less faithfully reproduce computer and console systems on a PC.
-
-MESS emulates the hardware of the systems and sometimes utilizes ROM images to
-load programs and games. Therefore, these systems are NOT simulations, but
-the actual emulations of the hardware.
-
-%package -n mess-tools
-Summary: Additional tools for MESS
-Requires: mess = %{version}-%{release}
-
-%description -n mess-tools
-%{summary}.
-
%package data
-Summary: Data files used by both MAME and MESS
-
-Provides: mess-data = %{version}-%{release}
+Summary: Data files used by MAME
BuildArch: noarch
@@ -128,12 +102,9 @@
%{summary}.
%package data-software-lists
-Summary: Software lists used by both MAME and MESS
+Summary: Software lists used by MAME
Requires: %{name}-data = %{version}-%{release}
-Provides: mess-data-software-lists = %{version}-%{release}
-Obsoletes: mess-data < 0.146-2
-
BuildArch: noarch
%description data-software-lists
@@ -142,30 +113,23 @@
%prep
-%if 0%{?svn}
-%setup -qn %{name}-export
-%else
%setup -qcT
for sourcefile in %{sources}; do
7za x $sourcefile
done
-find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
-%if 0%{?sourceupdate}
-i=1
-while [ $i -le %{sourceupdate} ]; do
- patch -p0 -E < 0%{baseversion}u${i}.diff
- i=`expr $i + 1`
-done
-%endif
-%endif
+
+find \( -regex '.*\.\(c\|fsh\|fx\|h\|lua\|map\|md\|txt\|vsh\|xml\)$' \
+ -o -wholename ./makefile \) -exec sed -i 's@\r@@' {} \;
+
%patch0 -p1 -b .fortify
-%patch2 -p1 -b .verbosebuild
+%patch1 -p1 -b .optflags
+%patch2 -p1 -b .systemlibs
# Fix encoding
-for whatsnew in whatsnew.txt; do
- iconv -f iso8859-1 -t utf-8 $whatsnew > $whatsnew.conv
- mv -f $whatsnew.conv $whatsnew
-done
+#for whatsnew in whatsnew_0162.txt; do
+# iconv -f iso8859-1 -t utf-8 $whatsnew > $whatsnew.conv
+# mv -f $whatsnew.conv $whatsnew
+#done
# Create ini files
cat > %{name}.ini << EOF
@@ -196,47 +160,39 @@
autosave 1
EOF
-#make a copy for MESS
-sed 's/%{name}/mess/g' %{name}.ini > mess.ini
-
%if %{with simd}
-sed -i 's/USE_SIMD (0)/USE_SIMD (1)/' src/emu/cpu/rsp/rsp.h
+sed -i 's at USE_SIMD (0)@USE_SIMD (1)@' src/emu/cpu/rsp/rsp.h
%endif
%build
-#these flags are already included in the Makefile
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 -g -pipe -Wall //')
+#these flags are already included in the genie.lua
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's at -O2 -g -pipe -Wall @@')
%if %{with simd}
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-mtune=generic/-march=corei7-avx/')
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's at -mtune=generic at -march=corei7-avx@')
%endif
#save some space
-MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_FLAC=0 BUILD_JPEGLIB=0 BUILD_SQLITE3=0 BUILD_MIDILIB=0 SUFFIX64="
+#jsoncpp and mongoose in Fedora are too old
+MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 VERBOSE=1 USE_SYSTEM_LIB_EXPAT=1 \
+ USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 \
+ USE_SYSTEM_LIB_LUA=1 USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1"
#only use assembly on supported architectures
%ifnarch %{ix86} x86_64 ppc ppc64
MAME_FLAGS="$MAME_FLAGS NOASM=1"
%endif
+#genie makes passing INI_PATH as define impossible
+sed -i 's@"$HOME/.APP_NAME;.;ini"@"%{_sysconfdir}/%{name};"@' src/osd/sdl/sdlmain.c
+
%if %{with ldplayer}
-make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'"
-find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
+make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
%if %{with debug}
-make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
-find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
-make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%else
-make %{?_smp_mflags} $MAME_FLAGS TARGET=mess \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
-find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
-make %{?_smp_mflags} $MAME_FLAGS\
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+make %{?_smp_mflags} $MAME_FLAGS TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
@@ -245,11 +201,9 @@
# create directories
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/mess
for folder in cfg comments diff ini inp memcard nvram snap sta
do
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/$folder
- install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mess/$folder
done
install -d $RPM_BUILD_ROOT%{_bindir}
for folder in artwork chds cheats ctrlr effects fonts hash hlsl keymaps roms \
@@ -257,30 +211,21 @@
do
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$folder
done
-for folder in artwork chds cheats ctrlr effects fonts hash hlsl keymaps roms \
- samples shader software
-do
- install -d $RPM_BUILD_ROOT%{_datadir}/mess/$folder
-done
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man6
# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -pm 644 mess.ini $RPM_BUILD_ROOT%{_sysconfdir}/mess
%if %{with ldplayer}
-install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 ldplayer?? $RPM_BUILD_ROOT%{_bindir}/ldplayer
%endif
%if %{with debug}
-install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 messd $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 %{name}??d $RPM_BUILD_ROOT%{_bindir}/%{name}
%else
-install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 mess $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 %{name}?? $RPM_BUILD_ROOT%{_bindir}/%{name}
%endif
-install -pm 755 chdman jedutil ldresample ldverify romcmp testkeys unidasm \
- castool floptool imgtool pngcmp nltool $RPM_BUILD_ROOT%{_bindir}
-#for tool in regrep runtest split src2html srcclean
+install -pm 755 castool chdman floptool imgtool jedutil ldresample ldverify \
+ nltool pngcmp romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
for tool in regrep split src2html srcclean
do
install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
@@ -291,15 +236,6 @@
install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
pushd src/osd/modules/opengl
install -pm 644 shader/*.?sh $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
-for folder in artwork hash hlsl keymaps shader
-do
- pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/$folder
- for i in *
- do
- ln -s ../../%{name}/$folder/$i ../../mess/$folder/$i
- done
- popd
-done
popd
pushd src/osd/sdl/man
%if %{with ldplayer}
@@ -312,11 +248,9 @@
%files
-%doc docs/config.txt docs/hlsl.txt docs/license.txt docs/mame.txt
-%doc docs/newvideo.txt docs/nscsi.txt
-%if !0%{?svn}
-%doc whatsnew*.txt
-%endif
+%doc docs/config.txt docs/floppy.txt docs/hlsl.txt docs/luaengine.md
+%doc docs/m6502.txt docs/mame.txt docs/mamelicense.txt docs/newvideo.txt
+%doc docs/nscsi.txt docs/SDL.txt README.md whatsnew*.txt
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
%{_sysconfdir}/skel/.%{name}
@@ -326,23 +260,30 @@
%{_bindir}/%{name}
%endif
%{_mandir}/man6/mame.6*
+%{_mandir}/man6/mess.6*
%files tools
+%doc docs/imgtool.txt
+%{_bindir}/castool
%{_bindir}/chdman
%{_bindir}/jedutil
+%{_bindir}/floptool
+%{_bindir}/imgtool
%{_bindir}/ldresample
%{_bindir}/ldverify
%{_bindir}/%{name}-regrep
%{_bindir}/nltool
%{_bindir}/pngcmp
%{_bindir}/romcmp
-#%{_bindir}/%{name}-runtest
%{_bindir}/%{name}-split
%{_bindir}/%{name}-src2html
%{_bindir}/%{name}-srcclean
%{_bindir}/testkeys
%{_bindir}/unidasm
+%{_mandir}/man1/castool.1*
%{_mandir}/man1/chdman.1*
+%{_mandir}/man1/floptool.1*
+%{_mandir}/man1/imgtool.1*
%{_mandir}/man1/jedutil.1*
%{_mandir}/man1/ldresample.1*
%{_mandir}/man1/ldverify.1*
@@ -355,41 +296,20 @@
%{_mandir}/man1/ldplayer.1*
%endif
-%files -n mess
-%if !0%{?svn}
-%doc messnew*.txt
-%endif
-%config(noreplace) %{_sysconfdir}/mess/mess.ini
-%dir %{_sysconfdir}/mess
-%{_sysconfdir}/skel/.mess
-%if %{with debug}
-%{_bindir}/messd
-%else
-%{_bindir}/mess
-%endif
-%{_mandir}/man6/mess.6*
-
-%files -n mess-tools
-%doc docs/imgtool.txt
-%{_bindir}/castool
-%{_bindir}/floptool
-%{_bindir}/imgtool
-%{_mandir}/man1/castool.1*
-%{_mandir}/man1/floptool.1*
-%{_mandir}/man1/imgtool.1*
-
%files data
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/hash/*
-%{_datadir}/mess
-%exclude %{_datadir}/mess/hash/*
%files data-software-lists
%{_datadir}/%{name}/hash/*
-%{_datadir}/mess/hash/*
%changelog
+* Sun Jun 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.162-1
+- Updated to 0.162
+- Adapted to the new build system
+- Cleaned up the .spec file considerably
+
* Sun Mar 29 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.160-1
- Updated to 0.160
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources 29 Mar 2015 19:21:04 -0000 1.87
+++ sources 8 Jun 2015 05:36:01 -0000 1.88
@@ -1 +1,2 @@
-780c9e239cef3e9c39bc973bc4cd4aa5 mame0160s.exe
+027efe41a3d799f8016f7508cf30ff3d mame0162s.exe
+4caaa10bf96663fab37c93609900897d whatsnew.zip
--- mame-verbosebuild.patch DELETED ---
More information about the rpmfusion-commits
mailing list