From c7b6067e2ec31427f8c0c9d2e4da4ac4e6045749 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 22:30:04 -0400 Subject: [PATCH 1/8] afix mame078 build --- recipes/recipes-ndk-standalone-armv7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes-ndk-standalone-armv7 b/recipes/recipes-ndk-standalone-armv7 index 8a6f72ee..5795a486 100644 --- a/recipes/recipes-ndk-standalone-armv7 +++ b/recipes/recipes-ndk-standalone-armv7 @@ -1,3 +1,3 @@ -mame078 libretro-mame078 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . +mame078 libretro-mame078 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile . scummvm libretro-scummvm https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build From 3a96b97e7ca132b469144f724f8878246881cbcf Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 21:38:12 -0500 Subject: [PATCH 2/8] add ngc --- libretro-buildbot-recipe.sh | 152 ++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 0aeae734..79433f03 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1574,4 +1574,156 @@ then fi +if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; +then + + while read line; do + + NAME=`echo $line | cut --fields=1 --delimiter=" "` + DIR=`echo $line | cut --fields=2 --delimiter=" "` + URL=`echo $line | cut --fields=3 --delimiter=" "` + TYPE=`echo $line | cut --fields=4 --delimiter=" "` + ENABLED=`echo $line | cut --fields=5 --delimiter=" "` + PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "` + + if [ "${ENABLED}" == "YES" ]; + then + echo "BUILDBOT JOB: $jobid Processing $NAME" + echo + echo NAME: $NAME + echo DIR: $DIR + echo PARENT: $PARENTDIR + echo URL: $URL + echo REPO TYPE: $TYPE + echo ENABLED: $ENABLED + + ARGS="" + + TEMP=`echo $line | cut --fields=9 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut --fields=10 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut --fields=11 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut --fields=12 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut --fields=13 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${ARGS} ${TEMP}" + fi + TEMP="" + TEMP=`echo $line | cut --fields=14 --delimiter=" "` + if [ -n ${TEMP} ]; + then + ARGS="${ARGS} ${TEMP}" + fi + + ARGS="${ARGS%"${ARGS##*[![:space:]]}"}" + + echo ARGS: $ARGS + + if [ -d "${PARENTDIR}/${DIR}/.git" ]; + then + cd $PARENTDIR + cd $DIR + echo "pulling from repo... " + OUT=`git pull` + echo $OUT + if [ "${TYPE}" == "PROJECT" ]; + then + RADIR=$DIR + if [[ $OUT == *"Already up-to-date"* ]] + then + BUILD="NO" + else + BUILD="YES" + fi + fi + cd $WORK + else + echo "cloning repo..." + cd $PARENTDIR + git clone "$URL" "$DIR" --depth=1 + cd $DIR + + if [ "${TYPE}" == "PROJECT" ]; + then + BUILD="YES" + RADIR=$DIR + + fi + cd $WORK + fi + fi + + echo + echo + done < $1.ra + if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; + then + + cd $RADIR + rm -rfv ngc/bot_pkg + echo "BUILDBOT JOB: $jobid Building" + echo + + if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; + then + + cd dist-scripts + rm *.a + cp -v $RARCH_DIST_DIR/*.a . + + ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh + sh ./ngc-cores.sh + if [ $? -eq 0 ]; + then + MESSAGE="retroarch build successful ($jobid)" + echo $MESSAGE + else + MESSAGE="retroarch build failed ($jobid)" + echo $MESSAGE + fi + buildbot_log "$MESSAGE" + cd .. + + fi + + echo "Packaging" + echo ============================================ + cp retroarch.cfg retroarch.default.cfg + + + mkdir -p ngc/bot_pkg/ + mkdir -p ngc/bot_pkg/cheats + mkdir -p ngc/bot_pkg/database + mkdir -p ngc/bot_pkg/database/cursors + mkdir -p ngc/bot_pkg/database/rdb + + cp -Rfv media/libretrodb/cht/* ngc/bot_pkg/cheats + cp -Rfv media/libretrodb/rdb/* ngc/bot_pkg/database/rdb + cp -Rfv media/libretrodb/cursors/* ngc/bot_pkg/database/cursors + + + fi + +fi + PATH=$ORIGPATH From a9511652455757c8699961bd3135c99fd43077ae Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 22:55:22 -0400 Subject: [PATCH 3/8] add ngc recipes --- recipes/ngc/devkitngc | 21 +++++++++++++++++++++ recipes/ngc/devkitngc.conf | 10 ++++++++++ recipes/ngc/devkitngc.ra | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 recipes/ngc/devkitngc create mode 100644 recipes/ngc/devkitngc.conf create mode 100644 recipes/ngc/devkitngc.ra diff --git a/recipes/ngc/devkitngc b/recipes/ngc/devkitngc new file mode 100644 index 00000000..d2e6670b --- /dev/null +++ b/recipes/ngc/devkitngc @@ -0,0 +1,21 @@ +fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk +fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 +fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 +fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte +genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . +mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . +mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . +mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . +mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . +mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile . +nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro +nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . +prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile . +quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro +snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC Makefile libretro +snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . +vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/ngc/devkitngc.conf b/recipes/ngc/devkitngc.conf new file mode 100644 index 00000000..cbc0a208 --- /dev/null +++ b/recipes/ngc/devkitngc.conf @@ -0,0 +1,10 @@ +PATH /opt/devkitPro/devkitPPC/bin +platform ngc +PLATFORM ngc +CC powerpc-eabi-gcc +CXX powerpc-eabi-g++ +AR powerpc--eabi-ar +SUFFIX _wii +DEVKITPRO /opt/devkitPro +DEVKITPPC /opt/devkitPro/devkitPPC +RA YES diff --git a/recipes/ngc/devkitngc.ra b/recipes/ngc/devkitngc.ra new file mode 100644 index 00000000..944b2400 --- /dev/null +++ b/recipes/ngc/devkitngc.ra @@ -0,0 +1,3 @@ +retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . +overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media +libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media From 1b0a50438f0428bc6f5769b204dc1c6b8ac26e16 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 23:06:21 -0400 Subject: [PATCH 4/8] fixes --- libretro-buildbot-recipe.sh | 2 +- libretro-config.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 79675d92..b6797efc 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1327,7 +1327,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then cd $PARENTDIR git clone "$URL" "$DIR" --depth=1 cd $DIR - + if [ "${TYPE}" == "PROJECT" ]; then BUILD="YES" RADIR=$DIR diff --git a/libretro-config.sh b/libretro-config.sh index 961f8578..108938ab 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -128,6 +128,12 @@ case "$platform" in FORMAT_COMPILER_TARGET="wii" DIST_DIR="wii" ;; + *ngc*) + platform=ngc + FORMAT_EXT="a" + FORMAT_COMPILER_TARGET="ngc" + DIST_DIR="ngc" + ;; theos_ios*) platform=theos_ios FORMAT_EXT="dylib" From 30afb437a9e687ab7192786b11a878acf5c47858 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 23:10:11 -0400 Subject: [PATCH 5/8] more fixes --- libretro-buildbot-recipe.sh | 2 +- recipes/ngc/devkitngc.ra | 2 +- recipes/wii/devkitwii.ra | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 79675d92..b6797efc 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1327,7 +1327,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then cd $PARENTDIR git clone "$URL" "$DIR" --depth=1 cd $DIR - + if [ "${TYPE}" == "PROJECT" ]; then BUILD="YES" RADIR=$DIR diff --git a/recipes/ngc/devkitngc.ra b/recipes/ngc/devkitngc.ra index 944b2400..014afb12 100644 --- a/recipes/ngc/devkitngc.ra +++ b/recipes/ngc/devkitngc.ra @@ -1,3 +1,3 @@ -retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . +retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media diff --git a/recipes/wii/devkitwii.ra b/recipes/wii/devkitwii.ra index 944b2400..014afb12 100644 --- a/recipes/wii/devkitwii.ra +++ b/recipes/wii/devkitwii.ra @@ -1,3 +1,3 @@ -retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . +retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media From 9c26f93b74d6ee2e3531d01c9a4774ec7e2437dd Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 10 Mar 2015 23:23:07 -0400 Subject: [PATCH 6/8] fix another derp with the ngc recipes --- libretro-buildbot-recipe.sh | 2 +- recipes/ngc/devkitngc.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index b6797efc..5109e125 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1500,7 +1500,7 @@ then rm *.a cp -v $RARCH_DIST_DIR/*.a . - ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh + ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_ngc." $2 }' |sh sh ./ngc-cores.sh if [ $? -eq 0 ]; then diff --git a/recipes/ngc/devkitngc.conf b/recipes/ngc/devkitngc.conf index cbc0a208..4db3ad40 100644 --- a/recipes/ngc/devkitngc.conf +++ b/recipes/ngc/devkitngc.conf @@ -4,7 +4,7 @@ PLATFORM ngc CC powerpc-eabi-gcc CXX powerpc-eabi-g++ AR powerpc--eabi-ar -SUFFIX _wii +SUFFIX _ngc DEVKITPRO /opt/devkitPro DEVKITPPC /opt/devkitPro/devkitPPC RA YES From 2ad1e91f694927323ad481e9173f2d7e4e36b477 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 11 Mar 2015 00:23:19 -0400 Subject: [PATCH 7/8] fix ngc packages [ --- libretro-buildbot-recipe.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 5109e125..1c9e7f22 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1489,7 +1489,6 @@ then then cd $RADIR - rm -rfv ngc/bot_pkg echo "BUILDBOT JOB: $jobid Building" echo @@ -1520,15 +1519,15 @@ then cp retroarch.cfg retroarch.default.cfg - mkdir -p ngc/bot_pkg/ - mkdir -p ngc/bot_pkg/cheats - mkdir -p ngc/bot_pkg/database - mkdir -p ngc/bot_pkg/database/cursors - mkdir -p ngc/bot_pkg/database/rdb + mkdir -p ngc/pkg/ + mkdir -p ngc/pkg/cheats + mkdir -p ngc/pkg/database + mkdir -p ngc/pkg/database/cursors + mkdir -p ngc/pkg/database/rdb - cp -Rfv media/libretrodb/cht/* ngc/bot_pkg/cheats - cp -Rfv media/libretrodb/rdb/* ngc/bot_pkg/database/rdb - cp -Rfv media/libretrodb/cursors/* ngc/bot_pkg/database/cursors + cp -Rfv media/libretrodb/cht/* ngc/pkg/cheats + cp -Rfv media/libretrodb/rdb/* ngc/pkg/database/rdb + cp -Rfv media/libretrodb/cursors/* ngc/pkg/database/cursors fi From f9abe4e8936894612bdaff08bd460be1e7f96894 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 11 Mar 2015 00:35:51 -0400 Subject: [PATCH 8/8] last fix for ngc --- libretro-buildbot-recipe.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 1c9e7f22..f3b5a86d 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1524,10 +1524,13 @@ then mkdir -p ngc/pkg/database mkdir -p ngc/pkg/database/cursors mkdir -p ngc/pkg/database/rdb + mkdir -p ngc/pkg/overlays cp -Rfv media/libretrodb/cht/* ngc/pkg/cheats cp -Rfv media/libretrodb/rdb/* ngc/pkg/database/rdb cp -Rfv media/libretrodb/cursors/* ngc/pkg/database/cursors + cp -Rfv media/overlays/* ngc/pkg/overlays + fi