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

mame: update 0187 -> 0188

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-08-06 21:49:14 +02:00
parent 1aea34d009
commit 0aa58a6cd7
2 changed files with 2 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,68 +0,0 @@
From 168f7f181099e6fbbb4ba7100e45f224afec6107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 26 Dec 2015 21:29:16 +0100
Subject: [PATCH] use pkg-config for finding sdl library settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
scripts/src/osd/sdl.lua | 6 +++---
scripts/src/osd/sdl_cfg.lua | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index d1a8322..32ca84a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -78,7 +78,7 @@ function maintargetosdoptions(_target,_subtarget)
}
configuration { }
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -280,7 +280,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
@@ -300,7 +300,7 @@ if BASE_TARGETOS=="unix" then
"SDL2",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs")
+ local str = backtick("pkg-config --libs sdl2")
addlibfromstring(str)
addoptionsfromstring(str)
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 0fd15e5..839a468 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -84,13 +84,13 @@ if BASE_TARGETOS=="unix" then
"MACOSX_USE_LIBSDL",
}
buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ backtick("pkg-config --cflags sdl2 | sed 's:/SDL::'"),
}
end
end
else
buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
+ backtick("pkg-config --cflags sdl2"),
}
if _OPTIONS["targetos"]~="asmjs" then
buildoptions {
--
2.5.5

5
recipes-emulators/mame/mame_0187.bb → recipes-emulators/mame/mame_0188.bb
View File

@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=0769ab9bcec03256fada66b95212b36d"
SRC_URI = " \
https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
"
SRC_URI[md5sum] = "304ad6657fa5b6928fa0257f91be10c1"
SRC_URI[sha256sum] = "5ac6950158ba6f550b3c5f19434752e837f17edf0d83c41ab07d0f02cca787b0"
SRC_URI[md5sum] = "d0811c2cfe39bf8b622c35b4012c8392"
SRC_URI[sha256sum] = "d3e55ec783fde39124bdb867ded9eadfcf769697d6c3d933444a29a785d6c99b"
S = "${WORKDIR}/${BPN}-${BPN}${PV}"