[solved] Build module of lr-yabause needs some lovin'

[retropiex86]

I just updated my retropie-x86. Everything except lr-yabause was build fine. Atfer inspecting it's build module, I found out that repo's file structure has changed in 2017 (!) - time to fix it for RetroPie. And as the corresponding github repo told me to publish this issue here first, here it is.

File: RetroPie-Setup/scriptmodules/libretrocores/lr-yabause.sh

--- lr-yabause.sh.orig  2017-03-01 16:47:36.717995923 +0200
+++ lr-yabause.sh       2019-09-04 16:45:55.158543048 +0200
@@ -21,26 +21,23 @@
 }
 
 function build_lr-yabause() {
-    cd libretro
+    cd yabause/src/libretro
     make clean
     if isPlatform "neon"; then
         make platform=armvneonhardfloat
     else
         make
     fi
-    md_ret_require="$md_build/libretro/yabause_libretro.so"
+    md_ret_require="$md_build/yabause/src/libretro/yabause_libretro.so"
 }
 
 function install_lr-yabause() {
     md_ret_files=(
-        'libretro/yabause_libretro.so'
+        'yabause/src/libretro/yabause_libretro.so'
         'yabause/AUTHORS'
         'yabause/COPYING'
         'yabause/ChangeLog'
-        'yabause/AUTHORS'
-        'yabause/GOALS'
         'yabause/README'
-        'yabause/README.LIN'
     )
 }
 
@@ -48,6 +45,6 @@
     mkRomDir "saturn"
     ensureSystemretroconfig "saturn"
 
-    addEmulator 1 "$md_id" "saturn" "$md_inst/yabause_libretro.so"
+    addEmulator 1 "$md_id" "saturn" "$md_inst/yabause/src/libretro/yabause_libretro.so"
     addSystem "saturn"
 }
 

[barbudreadmon]

@retropiex86 said in Build module of lr-yabause needs some lovin':

I found out that repo's file structure has changed in 2017 (!)

Nope, i rebased it last week against latest yabause standalone sources (the libretro fork had a few regressions) and used this opportunity for matching other yabause-based cores structure and backporting some stuff (mostly iso support stuff : chd, redump, zipped redump, ...), idk where you saw the 2017 thingy. Anyway, sorry, i totally forgot to tell you guys.

[BuZz]

@retropiex86 feel free to open a PR for this on our github - or I will look at it when I next get a chance. Thanks.

[mitu]

I had a PR ready, but forgot to submit it - https://github.com/RetroPie/RetroPie-Setup/pull/2831.

[retropiex86]

@mitu said in Build module of lr-yabause needs some lovin':

I had a PR ready, but forgot to submit it - https://github.com/RetroPie/RetroPie-Setup/pull/2831.

Ha! That's what I'm confused about :) I'd a look at the repo a few hours ago and thought "damn old, doesn't compile, fix needed", but now it's pull'ed and up to date. Thanks for that. But I loved waking you up :)