drop 32bit subsystem build
This commit is contained in:
parent
8748de3a91
commit
47e9d305ab
18
Makefile
18
Makefile
|
@ -24,31 +24,33 @@ src-pkg:
|
|||
tar cvJf sources.tar.xz sources .stamps
|
||||
|
||||
world:
|
||||
DEVICE=RG351P ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351P ARCH=aarch64 ./scripts/build_distro
|
||||
DEVICE=RG351V ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
|
||||
DEVICE=RG351MP ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
|
||||
DEVICE=RG552 ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG552 ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
RG351P:
|
||||
DEVICE=RG351P ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351P ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
RG351V:
|
||||
DEVICE=RG351V ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
RG351MP:
|
||||
DEVICE=RG351MP ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
RG552:
|
||||
DEVICE=RG552 ARCH=arm ./scripts/build_distro
|
||||
DEVICE=RG552 ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
lib32:
|
||||
DEVICE=RG351P ARCH=arm scripts/clean build-lib32
|
||||
DEVICE=RG351V ARCH=arm scripts/clean build-lib32
|
||||
DEVICE=RG351MP ARCH=arm scripts/clean build-lib32
|
||||
DEVICE=RG552 ARCH=arm scripts/clean build-lib32
|
||||
DEVICE=RG351P ARCH=arm scripts/build build-lib32
|
||||
DEVICE=RG351V ARCH=arm scripts/build build-lib32
|
||||
DEVICE=RG351MP ARCH=arm scripts/build build-lib32
|
||||
DEVICE=RG552 ARCH=arm scripts/build build-lib32
|
||||
|
||||
update:
|
||||
DEVICE=RG552 ARCH=aarch64 ./scripts/update_packages
|
||||
|
||||
|
|
|
@ -22,8 +22,10 @@
|
|||
TARGET_KERNEL_ARCH=arm64
|
||||
|
||||
# setup ARCH specific *FLAGS
|
||||
TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi -mtune=$TARGET_CPU"
|
||||
# TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi -mtune=$TARGET_CPU"
|
||||
TARGET_CFLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi"
|
||||
# Disable runtime checking support of ARMv8.0's optional LSE feature. Breaks gdb and mesa compile.
|
||||
TARGET_CFLAGS="${TARGET_CFLAGS} -mno-outline-atomics"
|
||||
TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
|
||||
# TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
|
||||
TARGET_LDFLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS}"
|
||||
GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
np2kai # Last major commit before hiatus is broken
|
||||
amiberry # stay on v3.3 for now
|
||||
raze # stay on current version
|
||||
|
|
|
@ -86,7 +86,7 @@ VERBOSE="${VERBOSE:-yes}"
|
|||
# value. The default is gigabytes. The actual value stored is rounded down to
|
||||
# the nearest multiple of 16 kilobytes. Keep in mind this per project .ccache
|
||||
# directory.
|
||||
CCACHE_CACHE_SIZE="25G"
|
||||
CCACHE_CACHE_SIZE="20G"
|
||||
|
||||
# read local persistent options from $ROOT if available
|
||||
if [ -f "${ROOT}/.coreelec/options" ]; then
|
||||
|
|
|
@ -78,7 +78,7 @@ else
|
|||
fi
|
||||
|
||||
if [ -z "$CCACHE_DIR" ]; then
|
||||
export CCACHE_DIR=${BUILD_ROOT}/.ccache-${TARGET_ARCH}
|
||||
export CCACHE_DIR=${BUILD_ROOT}/.ccache-${TARGET_ARCH}-${TARGET_CPU}
|
||||
fi
|
||||
|
||||
if [[ -z "$PATH" || ( "$PATH" != "$TOOLCHAIN/bin:$TOOLCHAIN/sbin" && "$PATH" = "${PATH#$TOOLCHAIN/bin:$TOOLCHAIN/sbin:}" ) ]]; then
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2020-present Fewtarius
|
||||
|
||||
source /usr/bin/env.sh
|
||||
source /etc/profile
|
||||
|
||||
jslisten set "killall retroarch32"
|
||||
|
||||
set_kill_keys "retroarch32"
|
||||
export LD_LIBRARY_PATH="/usr/lib32"
|
||||
/usr/bin/retroarch32 --appendconfig /usr/config/retroarch/retroarch32bit-append.cfg
|
||||
/usr/bin/clear-retroarch.sh
|
|
@ -67,26 +67,13 @@
|
|||
</game>
|
||||
|
||||
<game>
|
||||
<path>./Start 32bit Retroarch.sh</path>
|
||||
<name>Start 32bit RetroArch</name>
|
||||
<desc>Run 32bit RetroArch</desc>
|
||||
<path>./Start Retroarch.sh</path>
|
||||
<name>Start RetroArch</name>
|
||||
<desc>Run RetroArch</desc>
|
||||
<developer>AmberELEC</developer>
|
||||
<publisher>AmberELEC</publisher>
|
||||
<rating>1.0</rating>
|
||||
<releasedate>2021</releasedate>
|
||||
<genre>Script</genre>
|
||||
<thumbnail>./downloaded_images/retroarch32-thumb.png</thumbnail>
|
||||
<image>./downloaded_images/retroarch32.png</image>
|
||||
</game>
|
||||
|
||||
<game>
|
||||
<path>./Start 64bit Retroarch.sh</path>
|
||||
<name>Start 64bit RetroArch</name>
|
||||
<desc>Run 64bit RetroArch</desc>
|
||||
<developer>AmberELEC</developer>
|
||||
<publisher>AmberELEC</publisher>
|
||||
<rating>1.0</rating>
|
||||
<releasedate>2021</releasedate>
|
||||
<releasedate>2022</releasedate>
|
||||
<genre>Script</genre>
|
||||
<thumbnail>./downloaded_images/retroarch64-thumb.png</thumbnail>
|
||||
<image>./downloaded_images/retroarch64.png</image>
|
||||
|
|
|
@ -9,7 +9,7 @@ PKG_ARCH="any"
|
|||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE=""
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS_TARGET="toolchain $OPENGLES emulationstation retroarch lib32 imagemagick retrorun klbi"
|
||||
PKG_DEPENDS_TARGET="toolchain $OPENGLES emulationstation retroarch imagemagick retrorun klbi lib32"
|
||||
PKG_SHORTDESC="AmberELEC Meta Package"
|
||||
PKG_LONGDESC="AmberELEC Meta Package"
|
||||
PKG_IS_ADDON="no"
|
||||
|
@ -18,7 +18,7 @@ PKG_TOOLCHAIN="make"
|
|||
|
||||
PKG_EXPERIMENTAL=""
|
||||
PKG_EMUS="$LIBRETRO_CORES advancemame PPSSPPSDL amiberry hatarisa openbor scummvmsa solarus hypseus-singe ecwolf lzdoom gzdoom raze drastic duckstation mupen64plussa piemu yabasanshiroSA"
|
||||
PKG_TOOLS="grep wget ffmpeg libjpeg-turbo common-shaders glsl-shaders MC util-linux xmlstarlet sixaxis jslisten evtest mpv bluetool rs97-commander-sdl2 jslisten gnupg gzip patchelf valgrind strace gdb apitrace rg351p-js2xbox odroidgoa-utils rs97-commander-sdl2 textviewer 351files rclone jstest-sdl sdljoytest evdev-joystick"
|
||||
PKG_TOOLS="grep wget ffmpeg libjpeg-turbo common-shaders glsl-shaders MC util-linux xmlstarlet sixaxis jslisten evtest mpv bluetool rs97-commander-sdl2 jslisten gnupg gzip valgrind strace gdb apitrace rg351p-js2xbox odroidgoa-utils rs97-commander-sdl2 textviewer 351files rclone jstest-sdl sdljoytest evdev-joystick"
|
||||
PKG_RETROPIE_DEP="bash pyudev dialog six git dbus-python coreutils"
|
||||
PKG_DEPENDS_TARGET+=" $PKG_TOOLS $PKG_RETROPIE_DEP $PKG_EMUS $PKG_EXPERIMENTAL ports"
|
||||
|
||||
|
|
|
@ -211,9 +211,9 @@ class EmuRunner():
|
|||
log(f'platform: {self.platform}')
|
||||
log(f'core: {self.core}')
|
||||
retroarch_binary = 'retroarch'
|
||||
if self.core in {'pcsx_rearmed', 'parallel_n64'}:
|
||||
retroarch_binary = 'retroarch32'
|
||||
self.environment['LD_LIBRARY_PATH'] = '/usr/lib32'
|
||||
#if self.core in {'pcsx_rearmed', 'parallel_n64'}:
|
||||
# retroarch_binary = 'retroarch32'
|
||||
# self.environment['LD_LIBRARY_PATH'] = '/usr/lib32'
|
||||
|
||||
rom_path: 'Optional[Path]' = self.rom
|
||||
extension = self.rom.suffix[1:] if self.rom else None
|
||||
|
|
|
@ -349,11 +349,11 @@ else
|
|||
|
||||
### Check if we need retroarch 32 bits or 64 bits
|
||||
RABIN="retroarch"
|
||||
if [[ "${CORE}" =~ "pcsx_rearmed" ]] || [[ "${CORE}" =~ "parallel_n64" ]]
|
||||
then
|
||||
export LD_LIBRARY_PATH="/usr/lib32"
|
||||
RABIN="retroarch32"
|
||||
fi
|
||||
#if [[ "${CORE}" =~ "pcsx_rearmed" ]] || [[ "${CORE}" =~ "parallel_n64" ]]
|
||||
#then
|
||||
# export LD_LIBRARY_PATH="/usr/lib32"
|
||||
# RABIN="retroarch32"
|
||||
#fi
|
||||
|
||||
# Platform specific configurations
|
||||
case ${PLATFORM} in
|
||||
|
|
|
@ -156,10 +156,10 @@ def set_settings(rom_name: str, core: str, platform: str, controllers: str, auto
|
|||
logger.log(f'Device: {device_name}')
|
||||
|
||||
# Is the CORE 32 or 64bit?
|
||||
if core in {'pcsx_rearmed', 'parallel_n64'}:
|
||||
bits='32bit'
|
||||
else:
|
||||
bits='64bit'
|
||||
#if core in {'pcsx_rearmed', 'parallel_n64'}:
|
||||
# bits='32bit'
|
||||
#else:
|
||||
bits='64bit'
|
||||
logger.log(f'core is {bits}')
|
||||
|
||||
# Dictionary for the raappend.cfg
|
||||
|
|
|
@ -397,21 +397,21 @@ else
|
|||
# Turn off RGA scaling first - just in case
|
||||
sed -i "/video_ctx_scaling/d" ${RAAPPENDCONF}
|
||||
echo 'video_ctx_scaling = "false"' >> ${RAAPPENDCONF}
|
||||
if array_contains IS32BITCORE ${CORE}; then
|
||||
echo "video_filter = \"/usr/share/retroarch/filters/32bit/video/${EES}\"" >> ${RAAPPENDCONF}
|
||||
else
|
||||
#if array_contains IS32BITCORE ${CORE}; then
|
||||
# echo "video_filter = \"/usr/share/retroarch/filters/32bit/video/${EES}\"" >> ${RAAPPENDCONF}
|
||||
#else
|
||||
echo "video_filter = \"/usr/share/retroarch/filters/64bit/video/${EES}\"" >> ${RAAPPENDCONF}
|
||||
fi
|
||||
#fi
|
||||
fi
|
||||
|
||||
## Set correct path for video- and audio-filters
|
||||
if array_contains IS32BITCORE ${CORE}; then
|
||||
echo 'audio_filter_dir = "/usr/share/retroarch/filters/32bit/audio"' >> ${RAAPPENDCONF}
|
||||
echo 'video_filter_dir = "/usr/share/retroarch/filters/32bit/video"' >> ${RAAPPENDCONF}
|
||||
else
|
||||
#if array_contains IS32BITCORE ${CORE}; then
|
||||
# echo 'audio_filter_dir = "/usr/share/retroarch/filters/32bit/audio"' >> ${RAAPPENDCONF}
|
||||
# echo 'video_filter_dir = "/usr/share/retroarch/filters/32bit/video"' >> ${RAAPPENDCONF}
|
||||
#else
|
||||
echo 'audio_filter_dir = "/usr/share/retroarch/filters/64bit/audio"' >> ${RAAPPENDCONF}
|
||||
echo 'video_filter_dir = "/usr/share/retroarch/filters/64bit/video"' >> ${RAAPPENDCONF}
|
||||
fi
|
||||
#fi
|
||||
|
||||
## Rewind
|
||||
# Get configuration from distribution.conf and set to retroarch.cfg
|
||||
|
|
|
@ -1,24 +1,36 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC)
|
||||
|
||||
PKG_NAME="ccache"
|
||||
PKG_VERSION="3.7.12"
|
||||
PKG_SHA256="a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400"
|
||||
PKG_VERSION="4.6.3"
|
||||
PKG_SHA256="1e3a251bb112632553b8255a78661fe526c3a16598496d51128c32b218fd8b22"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://ccache.dev/download.html"
|
||||
PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_HOST="make:host"
|
||||
PKG_LONGDESC="A compiler cache to speed up re-compilation of C/C++ code by caching."
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib"
|
||||
PKG_TOOLCHAIN="cmake"
|
||||
|
||||
pre_configure_host() {
|
||||
export CC=${LOCAL_CC}
|
||||
export CXX=${LOCAL_CXX}
|
||||
mkdir -p ${TOOLCHAIN}/bin
|
||||
rm -f ${TOOLCHAIN}/bin/host-gcc
|
||||
rm -f ${TOOLCHAIN}/bin/host-g++
|
||||
ln -s ${LOCAL_CC} ${TOOLCHAIN}/bin/host-gcc
|
||||
ln -s ${LOCAL_CXX} ${TOOLCHAIN}/bin/host-g++
|
||||
PKG_CMAKE_OPTS_HOST="-DREDIS_STORAGE_BACKEND=OFF -DENABLE_DOCUMENTATION=OFF -DENABLE_TESTING=OFF -DZSTD_FROM_INTERNET=ON"
|
||||
}
|
||||
|
||||
pre_configure_init() {
|
||||
PKG_CMAKE_OPTS_INIT="-DREDIS_STORAGE_BACKEND=OFF -DENABLE_DOCUMENTATION=OFF -DENABLE_TESTING=OFF -DZSTD_FROM_INTERNET=ON"
|
||||
}
|
||||
|
||||
post_makeinstall_host() {
|
||||
rm -f ${TOOLCHAIN}/bin/host-gcc
|
||||
rm -f ${TOOLCHAIN}/bin/host-g++
|
||||
|
||||
# setup ccache
|
||||
if [ -z "${CCACHE_DISABLE}" ]; then
|
||||
${TOOLCHAIN}/bin/ccache --max-size=${CCACHE_CACHE_SIZE}
|
||||
|
|
|
@ -0,0 +1,88 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC)
|
||||
|
||||
PKG_NAME="build-lib32"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_DEPENDS_TARGET="toolchain gcc retroarch libsndfile libmodplug flac SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf SDL2_gfx"
|
||||
PKG_SHORTDESC="ARM 32bit bundle for aarch64"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
makeinstall_target() {
|
||||
cd ${PKG_BUILD}
|
||||
if [ "${ARCH}" = "arm" ]; then
|
||||
mkdir -p ${INSTALL}/usr/lib32
|
||||
LIBS="ld-2.*.so \
|
||||
ld-linux-armhf* \
|
||||
libarmmem-v7l* \
|
||||
libatomic* \
|
||||
librt* \
|
||||
libass* \
|
||||
libasound* \
|
||||
libopenal* \
|
||||
libpulse* \
|
||||
libfreetype* \
|
||||
libpthread* \
|
||||
libudev.so* \
|
||||
libusb-1.0* \
|
||||
libSDL2* \
|
||||
libmodplug* \
|
||||
libsndfile* \
|
||||
libvorbis* \
|
||||
libFLAC* \
|
||||
libavcodec* \
|
||||
libavformat* \
|
||||
libavutil* \
|
||||
libswscale* \
|
||||
libswresample* \
|
||||
libstdc++* \
|
||||
libm* \
|
||||
libgcc_s* \
|
||||
libc* \
|
||||
libfontconfig* \
|
||||
libexpat* \
|
||||
libbz2* \
|
||||
libz* \
|
||||
libpulsecommon-12* \
|
||||
libdbus-1* \
|
||||
libdav1d* \
|
||||
libspeex* \
|
||||
libssl* \
|
||||
libcrypt* \
|
||||
libsystemd* \
|
||||
libncurses* \
|
||||
libdl* \
|
||||
libMali* \
|
||||
libdrm* \
|
||||
librga* \
|
||||
libpng* \
|
||||
libjpeg* \
|
||||
libturbojpeg* \
|
||||
librockchip_mpp* \
|
||||
libxkbcommon* \
|
||||
libresolv* \
|
||||
libnss_dns* \
|
||||
libpthread* \
|
||||
libmali* \
|
||||
libGLES* \
|
||||
libgnutls* \
|
||||
libgbm* \
|
||||
libidn2* \
|
||||
libnettle* \
|
||||
libhogweed* \
|
||||
libgmp* \
|
||||
libuuid.so* \
|
||||
libEG*"
|
||||
|
||||
for lib in ${LIBS}
|
||||
do
|
||||
find ${PKG_BUILD}/../../build.${DISTRO}-${DEVICE}.arm/*/.install_pkg -name ${lib} -exec cp -vP \{} ${INSTALL}/usr/lib32 \;
|
||||
done
|
||||
chmod -f +x ${INSTALL}/usr/lib32/* || :
|
||||
cd ${INSTALL}
|
||||
tar -C ${INSTALL} -zcvpf ${PKG_BUILD}/lib32_${DEVICE}.tar.gz usr/lib32
|
||||
mkdir -p ${PKG_BUILD}/../../release/lib32
|
||||
mv ${PKG_BUILD}/lib32_${DEVICE}.tar.gz ${PKG_BUILD}/../../release/lib32
|
||||
fi
|
||||
}
|
|
@ -1,86 +1,18 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC)
|
||||
# Copyright (C) 2022-present AmberELEC (https://github.com/AmberELEC)
|
||||
|
||||
PKG_NAME="lib32"
|
||||
PKG_VERSION="5124eff4bfd961b0f76d621bb97b6e2f1fa501ec"
|
||||
PKG_ARCH="aarch64"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_DEPENDS_TARGET="toolchain retroarch SDL2 libsndfile libmodplug flac"
|
||||
PKG_SHORTDESC="ARM 32bit bundle for aarch64"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SITE="https://github.com/AmberELEC/lib32"
|
||||
PKG_URL="$PKG_SITE.git"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SHORTDESC="ARM 32bit bundles for aarch64"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/lib32
|
||||
cd ${PKG_BUILD}
|
||||
if [ "${ARCH}" = "aarch64" ]; then
|
||||
mkdir -p ${INSTALL}/usr/lib32
|
||||
LIBS="ld-2.*.so \
|
||||
ld-linux-armhf* \
|
||||
libarmmem-v7l* \
|
||||
libatomic* \
|
||||
librt* \
|
||||
libass* \
|
||||
libasound* \
|
||||
libopenal* \
|
||||
libpulse* \
|
||||
libfreetype* \
|
||||
libpthread* \
|
||||
libudev.so* \
|
||||
libusb-1.0* \
|
||||
libSDL2* \
|
||||
libmodplug* \
|
||||
libsndfile* \
|
||||
libvorbis* \
|
||||
libFLAC* \
|
||||
libavcodec* \
|
||||
libavformat* \
|
||||
libavutil* \
|
||||
libswscale* \
|
||||
libswresample* \
|
||||
libstdc++* \
|
||||
libm* \
|
||||
libgcc_s* \
|
||||
libc* \
|
||||
libfontconfig* \
|
||||
libexpat* \
|
||||
libbz2* \
|
||||
libz* \
|
||||
libpulsecommon-12* \
|
||||
libdbus-1* \
|
||||
libdav1d* \
|
||||
libspeex* \
|
||||
libssl* \
|
||||
libcrypt* \
|
||||
libsystemd* \
|
||||
libncurses* \
|
||||
libdl* \
|
||||
libMali* \
|
||||
libdrm* \
|
||||
librga* \
|
||||
libpng* \
|
||||
libjpeg* \
|
||||
libturbojpeg* \
|
||||
libgo2* \
|
||||
libevdev* \
|
||||
librockchip_mpp* \
|
||||
libxkbcommon* \
|
||||
libresolv* \
|
||||
libnss_dns* \
|
||||
libpthread* \
|
||||
libmali* \
|
||||
libGLES* \
|
||||
libgnutls* \
|
||||
libgbm* \
|
||||
libidn2* \
|
||||
libnettle* \
|
||||
libhogweed* \
|
||||
libgmp* \
|
||||
libuuid.so* \
|
||||
libEG*"
|
||||
|
||||
for lib in ${LIBS}
|
||||
do
|
||||
find $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/*/.install_pkg -name ${lib} -exec cp -vP \{} ${INSTALL}/usr/lib32 \;
|
||||
done
|
||||
chmod -f +x ${INSTALL}/usr/lib32/* || :
|
||||
fi
|
||||
}
|
||||
tar xvfz lib32_${DEVICE}.tar.gz
|
||||
cp -rfv usr/lib32/* ${INSTALL}/usr/lib32
|
||||
}
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="retroarch-assets"
|
||||
PKG_VERSION="ee33f8ef693b42a8e23ca3fd48f43f345e7cd087"
|
||||
PKG_SHA256="b110163b0898b56be5245fd77a626b69fe5624234a5bf6af22487e2c2ee50a33"
|
||||
PKG_VERSION="4ec80faf1b5439d1654f407805bb66141b880826"
|
||||
PKG_SHA256="1a5dfb3acb864bacd3f3fd0121c4904438ae52703187fc61d46f0d43500562aa"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/libretro/retroarch-assets"
|
||||
PKG_URL="https://github.com/libretro/retroarch-assets/archive/$PKG_VERSION.tar.gz"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC)
|
||||
|
||||
PKG_NAME="retroarch"
|
||||
PKG_VERSION="389ef31a8f4a505f255e9bfebe882750d22ab490"
|
||||
PKG_VERSION="840c4481ab7cb0720025c30ea609d16e60927a02"
|
||||
PKG_SITE="https://github.com/libretro/RetroArch"
|
||||
PKG_URL="$PKG_SITE.git"
|
||||
PKG_LICENSE="GPLv3"
|
||||
|
@ -63,10 +63,10 @@ makeinstall_target() {
|
|||
if [ "${ARCH}" == "aarch64" ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/retroarch $INSTALL/usr/bin
|
||||
cp -vP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
|
||||
#cp -vP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
|
||||
|
||||
mkdir -p $INSTALL/usr/share/retroarch/filters
|
||||
cp -rvP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/* ${INSTALL}/usr/share/retroarch/filters
|
||||
#cp -rvP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/* ${INSTALL}/usr/share/retroarch/filters
|
||||
|
||||
mkdir -p $INSTALL/etc
|
||||
cp $PKG_BUILD/retroarch.cfg $INSTALL/etc
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC)
|
||||
|
||||
PKG_NAME="retrorun"
|
||||
PKG_VERSION="b3db93261834e9c9a12db516c6cd9582458d51e9"
|
||||
PKG_VERSION="e4c6250c4db80f0bd9d793a746913acbac4f123f"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/AmberELEC/retrorun-go2"
|
||||
|
@ -32,8 +32,8 @@ makeinstall_target() {
|
|||
else
|
||||
cp retrorun $INSTALL/usr/bin
|
||||
cp $PKG_DIR/retrorun.sh $INSTALL/usr/bin
|
||||
cp -vP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retrorun-*/.install_pkg/usr/bin/retrorun32 $INSTALL/usr/bin
|
||||
#cp -vP $PKG_BUILD/../../build.${DISTRO}-${DEVICE}.arm/retrorun-*/.install_pkg/usr/bin/retrorun32 $INSTALL/usr/bin
|
||||
mkdir -p $INSTALL/usr/config/distribution/configs
|
||||
cp -vP $PKG_DIR/retrorun.cfg $INSTALL/usr/config/distribution/configs
|
||||
fi
|
||||
}
|
||||
}
|
||||
|
|
|
@ -311,15 +311,15 @@ then
|
|||
fi
|
||||
|
||||
sleep 0.2
|
||||
if [[ "$1" =~ "pcsx_rearmed" ]] || [[ "$1" =~ "parallel_n64" ]]
|
||||
then
|
||||
echo 'using 32bit'
|
||||
export LD_LIBRARY_PATH="/usr/lib32"
|
||||
/usr/bin/retrorun32 --triggers $FPS $GPIO_JOYPAD -s /storage/roms/"$3" -d /roms/bios "$1" "$2"
|
||||
else
|
||||
echo 'using 64bit'
|
||||
#if [[ "$1" =~ "pcsx_rearmed" ]] || [[ "$1" =~ "parallel_n64" ]]
|
||||
#then
|
||||
# echo 'using 32bit'
|
||||
# export LD_LIBRARY_PATH="/usr/lib32"
|
||||
# /usr/bin/retrorun32 --triggers $FPS $GPIO_JOYPAD -s /storage/roms/"$3" -d /roms/bios "$1" "$2"
|
||||
#else
|
||||
# echo 'using 64bit'
|
||||
/usr/bin/retrorun --triggers $FPS $GPIO_JOYPAD -s /storage/roms/"$3" -d /roms/bios "$1" "$2"
|
||||
fi
|
||||
#fi
|
||||
sleep 0.5
|
||||
rm /dev/input/by-path/platform-odroidgo2-joypad-event-joystick
|
||||
kill $(pidof rg351p-js2xbox)
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
TARGET_PATCH_ARCH="aarch64"
|
||||
TARGET_FLOAT="hard"
|
||||
TARGET_CPU="cortex-a35"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd+crypto"
|
||||
TARGET_FPU="fp-armv8"
|
||||
TARGET_FEATURES="64bit"
|
||||
;;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
TARGET_PATCH_ARCH="aarch64"
|
||||
TARGET_FLOAT="hard"
|
||||
TARGET_CPU="cortex-a35"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd+crypto"
|
||||
TARGET_FPU="fp-armv8"
|
||||
TARGET_FEATURES="64bit"
|
||||
;;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
TARGET_PATCH_ARCH="aarch64"
|
||||
TARGET_FLOAT="hard"
|
||||
TARGET_CPU="cortex-a35"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd+crypto"
|
||||
TARGET_FPU="fp-armv8"
|
||||
TARGET_FEATURES="64bit"
|
||||
;;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
TARGET_PATCH_ARCH="aarch64"
|
||||
TARGET_FLOAT="hard"
|
||||
TARGET_CPU="cortex-a72.cortex-a53"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd"
|
||||
TARGET_CPU_FLAGS="+crc+fp+simd+crypto"
|
||||
TARGET_FPU="fp-armv8"
|
||||
TARGET_FEATURES="64bit"
|
||||
;;
|
||||
|
|
|
@ -34,7 +34,7 @@ elif [ "${ARCH}" == "arm" ]
|
|||
then
|
||||
# Only build the 32bit packages that we need rather than the whole image
|
||||
# to speed up the build process and save disk space.
|
||||
for package in gcc retroarch retrorun pcsx_rearmed parallel-n64 SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf SDL2_gfx
|
||||
for package in build-lib32
|
||||
do
|
||||
scripts/build ${package}
|
||||
if [ ! $? == 0 ]
|
||||
|
|
Loading…
Reference in New Issue