Update to LE 9.1.501 + ports from master to Lakka-LE9.2

build_all.sh

@@ -15,6 +15,7 @@ targets="\
 	Rockchip|RK3399|arm|image \
 	Rockchip|TinkerBoard|arm|image \
 	RPi|Gamegirl|arm|image \
+	RPi|GPICase|arm|noobs \
 	RPi|RPi|arm|noobs \
 	RPi|RPi2|arm|noobs \
 	RPi|RPi4|arm|noobs \

config/functions

@@ -136,7 +136,7 @@ safe_remove() {
 
   [ -z "${path}" ] && return 0
 
-  if [ -f "${path}" -o -d "${path}" ]; then
+  if [ -e "${path}" -o -L "${path}" ]; then
     rm -r "${path}"
   elif [ -n "${PKG_NAME}" ]; then
     print_color CLR_WARNING "safe_remove: path does not exist: [${PKG_NAME}]: ${path}\n"
@@ -242,12 +242,12 @@ setup_toolchain() {
   fi
 
   # parallel
-  if ! flag_enabled "parallel" "yes"; then
-    NINJA_OPTS="$NINJA_OPTS -j1"
-    export MAKEFLAGS="-j1"
-  else
+  if flag_enabled "parallel" "yes"; then
     NINJA_OPTS="$NINJA_OPTS -j$CONCURRENCY_MAKE_LEVEL"
     export MAKEFLAGS="-j$CONCURRENCY_MAKE_LEVEL"
+  else
+    NINJA_OPTS="$NINJA_OPTS -j1"
+    export MAKEFLAGS="-j1"
   fi
 
   # verbose flag
@@ -1251,7 +1251,7 @@ pkg_lock() {
 
   local pkg="$1" task="$2" parent_pkg="$3"
   local this_job="${MTJOBID}"
-  local lock_job lock_seq lock_task lock_pkg locked=no
+  local lock_job lock_seq lock_task lock_pkg locked=no idwidth
   local fail_seq
 
   exec 98>"${THREAD_CONTROL}/locks/${pkg}.${task}"
@@ -1262,7 +1262,8 @@ pkg_lock() {
   done
 
   if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
-    pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%02d] %s %s" ${lock_job} "${lock_task}" "${lock_pkg}")"
+    [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+    pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%0*d] %s %s" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
     flock --exclusive 98
   fi
 
@@ -1290,13 +1291,15 @@ pkg_lock_status() {
   [ "${MTWITHLOCKS}" != "yes" ] && return 0
 
   local status="$1" pkg="$2" task="$3" msg="$4"
-  local this_job="${MTJOBID}" line
+  local this_job="${MTJOBID}" line idwidth
+
+  [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
 
   (
     flock --exclusive 94
 
-    printf -v line "%s: <%06d> [%02d/%0*d] %-7s %-7s %-35s" \
-    "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}"
+    printf -v line "%s: <%06d> [%0*d/%0*d] %-7s %-7s %-35s" \
+      "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${idwidth} ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}"
     [ -n "${msg}" ] && line+=" (${msg})"
 
     echo "${line}" >>"${THREAD_CONTROL}/history"
@@ -1322,10 +1325,12 @@ update_dashboard() {
 
   local status="$1" pkg="$2" task="$3" msg="$4"
   local line sedline preamble num elapsed projdevarch
-  local boldred boldgreen boldyellow endcolor
+  local boldred boldgreen boldyellow endcolor idwidth
 
   sedline=$((MTJOBID + 2))
 
+  [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+
   num=$(< "${THREAD_CONTROL}/status.max")
   if [ ${num} -lt ${sedline} ]; then
     echo ${sedline} >"${THREAD_CONTROL}/status.max"
@@ -1357,7 +1362,7 @@ update_dashboard() {
     esac
   fi
 
-  printf -v line "[%02d\/%0*d] %b%-7s%b %-7s %-35s" ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}"
+  printf -v line "[%0*d\/%0*d] %b%-7s%b %-7s %-35s" ${idwidth} ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}"
   [ -n "${msg}" ] && line+=" ${msg//\//\\/}"
 
   sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status"
@@ -1370,7 +1375,7 @@ acquire_exclusive_lock() {
 
   local pkg="$1" task="$2" lockfile="${3:-global}"
   local this_job="${MTJOBID}"
-  local lock_job lock_seq lock_task lock_pkg locked=no
+  local lock_job lock_seq lock_task lock_pkg locked=no idwidth
 
   exec 96>"${THREAD_CONTROL}/locks/.mutex.${lockfile}"
   while [ : ]; do
@@ -1380,7 +1385,8 @@ acquire_exclusive_lock() {
   done
 
   if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
-    pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%02d] %s %s" "${lockfile}" ${lock_job} "${lock_task}" "${lock_pkg}")"
+    [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
+    pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%0*d] %s %s" "${lockfile}" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
     flock --exclusive 96
   fi
 

config/multithread

@@ -147,15 +147,16 @@ start_multithread_build() {
   echo 0 >"${THREAD_CONTROL}/status.max"
   touch "${THREAD_CONTROL}/status"
 
-  [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1
+  # Increase file descriptors if building one thread/package
+  [ "${THREADCOUNT}" = "0" ] && ulimit -n ${ULIMITN:-10240}
 
   # Bootstrap GNU parallel
   MTWITHLOCKS=no $SCRIPTS/build parallel:host 2>&1 || die "Unable to bootstrap parallel package"
 
-  # if number of detected slots is 1 then don't bother using inter-process locks as this is a sequential build
+  # determine number of available slots for the given THREADCOUNT - optimise logging for single threaded builds
   [ $(seq 1 32 | ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-procs ${THREADCOUNT} echo {%} | sort -n | tail -1) -eq 1 ] && singlethread=yes || singlethread=no
 
-  # create a single log file by default if not using locks (single build process), or the builder is a masochist
+  # create a single log file by default for a single threaded build (or the builder is a masochist)
   if [ "${singlethread}" = "yes" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
     buildopts+=" --ungroup"
   else
@@ -174,6 +175,8 @@ start_multithread_build() {
     ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@} > "${THREAD_CONTROL}"/plan || result=1
 
   if [ ${result} -eq 0 ]; then
+    save_build_config
+
     cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
       MTBUILDSTART=$(date +%s) MTWITHLOCKS=yes ${TOOLCHAIN}/bin/parallel \
         --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" --plus ${buildopts} \

config/path

@@ -29,6 +29,10 @@ if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi
 
+if [ "$IGNORE_VERSION" = "1" ]; then
+  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH
+fi
+
 THREAD_CONTROL=${BUILD}/.threads
 
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"

distributions/Lakka/options

@@ -76,7 +76,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nouveau vmware virtio"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nouveau"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="no"
@@ -165,7 +165,101 @@
 
   LAKKA_MIRROR="http://sources.lakka.tv"
 
-  LIBRETRO_CORES="2048 4do 81 atari800 beetle-bsnes beetle-lynx beetle-ngp beetle-pce beetle-pcfx beetle-psx beetle-saturn beetle-supergrafx beetle-vb beetle-wswan bluemsx bsnes bsnes-mercury cannonball cap32 chailove citra crocods desmume desmume-2015 dinothawr dolphin dosbox dosbox-svn easyrpg fbneo fceumm flycast freeintv fuse-libretro gambatte genesis-plus-gx gearboy gearsystem gme gpsp gw-libretro handy hatari higan-sfc higan-sfc-balanced kronos lutro mame2003-plus melonds meowpc98 mesen mesen-s mgba mrboom mupen64plus_next nestopia nxengine o2em openlara parallel-n64 pcsx_rearmed picodrive play pocketcdg ppsspp prboom prosystem puae px68k reminiscence sameboy scummvm snes9x snes9x2002 snes9x2005 snes9x2005_plus snes9x2010 stella tgbdual theodore tic80 tyrquake uae4arm uzem vbam vecx vice virtualjaguar xrick yabasanshiro yabause"
+  LIBRETRO_CORES=""\
+" 2048 "\
+" 4do "\
+" 81 "\
+" atari800 "\
+" beetle-bsnes "\
+" beetle-lynx "\
+" beetle-ngp "\
+" beetle-pce "\
+" beetle-pcfx "\
+" beetle-psx "\
+" beetle-saturn "\
+" beetle-supergrafx "\
+" beetle-vb "\
+" beetle-wswan "\
+" bluemsx "\
+" bsnes "\
+" bsnes_hd "\
+" bsnes-mercury "\
+" cannonball "\
+" cap32 "\
+" chailove "\
+" citra "\
+" crocods "\
+" daphne "\
+" desmume "\
+" desmume-2015 "\
+" dinothawr "\
+" dolphin "\
+" dosbox "\
+" dosbox-svn "\
+" easyrpg "\
+" fbneo "\
+" fceumm "\
+" flycast "\
+" freeintv "\
+" fuse-libretro "\
+" gambatte "\
+" genesis-plus-gx "\
+" gearboy "\
+" gearsystem "\
+" gme "\
+" gpsp "\
+" gw-libretro "\
+" handy "\
+" hatari "\
+" higan-sfc "\
+" higan-sfc-balanced "\
+" kronos "\
+" lutro "\
+" mame2003-plus "\
+" melonds "\
+" meowpc98 "\
+" mesen "\
+" mesen-s "\
+" mgba "\
+" mrboom "\
+" mupen64plus_next "\
+" nestopia "\
+" nxengine "\
+" o2em "\
+" openlara "\
+" parallel-n64 "\
+" pcsx_rearmed "\
+" picodrive "\
+" play "\
+" pocketcdg "\
+" ppsspp "\
+" prboom "\
+" prosystem "\
+" puae "\
+" px68k "\
+" reminiscence "\
+" sameboy "\
+" scummvm "\
+" snes9x "\
+" snes9x2002 "\
+" snes9x2005 "\
+" snes9x2005_plus "\
+" snes9x2010 "\
+" stella2014 "\
+" tgbdual "\
+" theodore "\
+" tic80 "\
+" tyrquake "\
+" uae4arm "\
+" uzem "\
+" vbam "\
+" vecx "\
+" vice "\
+" virtualjaguar "\
+" xrick "\
+" yabasanshiro "\
+" yabause "\
+""
 
   RA_PLAYLIST_NAMES=""\
 "Atari - 2600.lpl;"\
@@ -236,10 +330,11 @@
 "Sony - PlayStation.lpl;"\
 "Thomson - MOTO.lpl;"\
 "TIC-80.lpl;"\
-"The 3DO Company - 3DO.lpl"
+"The 3DO Company - 3DO.lpl"\
+""
 
   RA_PLAYLIST_CORES=""\
-"/tmp/cores/stella_libretro.so;"\
+"/tmp/cores/stella2014_libretro.so;"\
 "/tmp/cores/atari800_libretro.so;"\
 "/tmp/cores/prosystem_libretro.so;"\
 "/tmp/cores/virtualjaguar_libretro.so;"\
@@ -307,7 +402,8 @@
 "/tmp/cores/pcsx_rearmed_libretro.so;"\
 "/tmp/cores/theodore_libretro.so;"\
 "/tmp/cores/tic80_libretro.so;"\
-"/tmp/cores/4do_libretro.so"
+"/tmp/cores/4do_libretro.so"\
+""
 
 # override some playlist core assignation
   if [ "$PROJECT" = "RPi" ]; then
@@ -333,18 +429,61 @@
 
 # disable some cores
   if [ "$PROJECT" = "RPi" ]; then
-    LIBRETRO_CORES="${LIBRETRO_CORES//yabasanshiro/}"
-    if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Gamegirl" ]; then
-      LIBRETRO_CORES="${LIBRETRO_CORES//ppsspp/}"
-      LIBRETRO_CORES="${LIBRETRO_CORES//uae4arm/}"
-      LIBRETRO_CORES="${LIBRETRO_CORES//flycast/}"
-      LIBRETRO_CORES="${LIBRETRO_CORES//mupen64plus_next/}"
-      LIBRETRO_CORES="${LIBRETRO_CORES//play/}"
+    LIBRETRO_CORES="${LIBRETRO_CORES// yabasanshiro /}"
+    if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Gamegirl" -o "$DEVICE" = "GPICase" ]; then
+      LIBRETRO_CORES="${LIBRETRO_CORES// 4do /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// beetle-bsnes /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// beetle-psx /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// beetle-saturn /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// beetle-vb /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// bsnes-mercury /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// bsnes /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// citra /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// desmume-2015 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// desmume /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// dolphin /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// dosbox-svn /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// dosbox /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// fbneo /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// flycast /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// genesis-plus-gx /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// higan-sfc-balanced /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// higan-sfc /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// kronos /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mame2003-plus /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mame2003 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mame2010 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// melonds /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// meowpc98 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mesen-s /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mesen /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mupen64plus_next /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// mupen64plus /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// openlara /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// play /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// parallel-n64 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// ppsspp /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// puae /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// snes9x2005_plus /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// snes9x2005 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// snes9x2010 /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// snes9x  /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// uae4arm /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// vbam /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// virtualjaguar /}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// yabause /}"
     elif [ "$DEVICE" = "RPi2" ]; then
-      LIBRETRO_CORES="${LIBRETRO_CORES//play/}"
+      LIBRETRO_CORES="${LIBRETRO_CORES// play /}"
     fi
   elif [ "$PROJECT" = "Amlogic" -o "$PROJECT" = "WeTek_Core" -o "$PROJECT" = "WeTek_Play" -o "$PROJECT" = "Rockchip" -o "$PROJECT" = "Allwinner" ]; then
-    LIBRETRO_CORES="${LIBRETRO_CORES//yabasanshiro/}"
+    LIBRETRO_CORES="${LIBRETRO_CORES// yabasanshiro /}"
   elif [ "$PROJECT" = "Generic" -a "$ARCH" = "i386" ]; then
-    LIBRETRO_CORES="${LIBRETRO_CORES//openlara/}"
+    LIBRETRO_CORES="${LIBRETRO_CORES// openlara /}"
+  fi
+
+# add platform specific cores
+  if [ "$PROJECT" = "RPi" ]; then
+    if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Gamegirl" -o "$DEVICE" = "GPICase" ]; then
+      LIBRETRO_CORES+=" mame2000  fbalpha2012 "
+    fi
   fi

packages/addons/addon-depends/chrome-depends/icu/package.mk

@@ -7,6 +7,7 @@ PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"
 PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz"
+PKG_DEPENDS_HOST="gcc:host"
 PKG_DEPENDS_TARGET="toolchain icu:host"
 PKG_LONGDESC="International Components for Unicode library."
 

packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk

@@ -7,7 +7,7 @@ PKG_SHA256="5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
 PKG_URL="http://freedesktop.org/~hadess/shared-mime-info-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libxml2"
+PKG_DEPENDS_TARGET="toolchain glib libxml2"
 PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
 PKG_BUILD_FLAGS="-parallel"