zepto-forks/meta-retro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mame: update to 0171

Browse Source 
* SDL 1.2 support was removed
* During tests it started compiling at do_configure. to avoid that
  CLEANBROKEN = "1" was added

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-03-12 00:27:59 +01:00
parent 3df243d8ba
commit 43b241e473
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
View File

@@ -13,41 +13,41 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 4cb31f3..b0ea27c 100644
index 76947ad..9b6b54d 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -258,7 +258,7 @@ if BASE_TARGETOS=="unix" then
@@ -68,7 +68,7 @@ function maintargetosdoptions(_target,_subtarget)
}
end
configuration { }
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -278,7 +278,7 @@ if BASE_TARGETOS=="unix" then
}
end
@@ -256,7 +256,7 @@ if BASE_TARGETOS=="unix" then
"SDL2.framework",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ local str = backtick("pkg-config --libs --static sdl2 | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -270,7 +270,7 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- local str = backtick(sdlconfigcmd() .. " --libs")
+ local str = backtick("pkg-config --libs sdl2")
addlibfromstring(str)
addoptionsfromstring(str)
if _OPTIONS["targetos"]~="haiku" then
@@ -299,7 +299,7 @@ if BASE_TARGETOS=="unix" then
end
end
elseif BASE_TARGETOS=="os2" then
- local str = backtick(sdlconfigcmd() .. " --libs")
+ local str = backtick("pkg-config --libs sdl2")
addlibfromstring(str)
addoptionsfromstring(str)
links {
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 878a5a2..febb084 100644
index e3a6f91..f88394e 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -90,12 +90,12 @@ if BASE_TARGETOS=="unix" then
@@ -84,12 +84,12 @@ if BASE_TARGETOS=="unix" then
"MACOSX_USE_LIBSDL",
}
buildoptions {
@@ -62,7 +62,7 @@ index 878a5a2..febb084 100644
}
if _OPTIONS["targetos"]~="asmjs" then
buildoptions {
@@ -148,6 +148,6 @@ elseif _OPTIONS["targetos"]=="os2" then
@@ -142,7 +142,7 @@ elseif _OPTIONS["targetos"]=="os2" then
"SDLMAME_OS2",
}
buildoptions {
@@ -70,6 +70,7 @@ index 878a5a2..febb084 100644
+ backtick("pkg-config --cflags sdl2"),
}
end
--
2.5.0

7
recipes-emulators/mame/mame_0170.bb → recipes-emulators/mame/mame_0171.bb
View File

@@ -9,8 +9,8 @@ SRC_URI = " \
file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
file://0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch \
"
SRC_URI[md5sum] = "c75857953b36347503c5e4ac6e10cc4d"
SRC_URI[sha256sum] = "eb4b319a69b1876601407df37fdd0aa3ff54929c8e7fa90e6016aff0e074bb53"
SRC_URI[md5sum] = "4b21d52df5f826de756a4c80975bd414"
SRC_URI[sha256sum] = "e543316e238b02ae80f8de6e1da3eaaac3754bc8370deb7c31a4bc73121763c5"
S = "${WORKDIR}/${BPN}-${BPN}${PV}"
@@ -29,12 +29,13 @@ DEPENDS = " \
portaudio-v19 \
"
CLEANBROKEN = "1"
EXTRA_OEMAKE = " \
linux \
CROSS_BUILD=1 \
OVERRIDE_CC='${CC}' \
OVERRIDE_CXX='${CXX}' \
SDL_LIBVER=sdl2 \
TOOLS=1 \
USE_QTDEBUG=0 \
NOWERROR=1 \