diff --git a/Makefile b/Makefile index 6b97bc40c..2768fc2e9 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ distclean: src-pkg: tar cvJf sources.tar.xz sources .stamps -world: RG552 RG503 RG353P RG351P RG351V RG351MP X86_64 +world: RG552 RG503 RG353P RG351P RG351V RG351MP X86_64: PROJECT=PC DEVICE=X86_64 ARCH=x86_64 ./scripts/build_distro diff --git a/packages/games/emulators/amiberry/package.mk b/packages/games/emulators/amiberry/package.mk index 8eb14f113..6bf127aa7 100644 --- a/packages/games/emulators/amiberry/package.mk +++ b/packages/games/emulators/amiberry/package.mk @@ -2,6 +2,7 @@ # Copyright (C) 2018-present Frank Hartung (supervisedthinking (@) gmail.com) PKG_NAME="amiberry" +PKG_ARCH="arm aarch64" PKG_VERSION="fa0489385b27d9842a3aee1b107e0d8bfcc297b5" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/midwan/amiberry" diff --git a/packages/games/emulators/duckstationsa/package.mk b/packages/games/emulators/duckstationsa/package.mk index 039cc882c..fde742cd2 100644 --- a/packages/games/emulators/duckstationsa/package.mk +++ b/packages/games/emulators/duckstationsa/package.mk @@ -4,16 +4,24 @@ PKG_NAME="duckstationsa" PKG_VERSION="5ab5070d73f1acc51e064bd96be4ba6ce3c06f5c" -PKG_ARCH="aarch64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/stenzek/duckstation" PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_TARGET="toolchain SDL2 nasm:host ${OPENGLES} libevdev" +PKG_DEPENDS_TARGET="toolchain SDL2 nasm:host libevdev" PKG_SECTION="libretro" PKG_SHORTDESC="Fast PlayStation 1 emulator for x86-64/AArch32/AArch64 " PKG_TOOLCHAIN="cmake" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + + pre_configure_target() { PKG_CMAKE_OPTS_TARGET+=" -DANDROID=OFF \ -DBUILD_LIBRETRO_CORE=OFF \ diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk index 63410fb83..51922de85 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk index 12705c766..7ff3933dc 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk @@ -23,14 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 - export USE_GLES=1 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac + export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/default.ini b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/default.ini new file mode 100644 index 000000000..8005fb6fc --- /dev/null +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/default.ini @@ -0,0 +1,25 @@ +; RG552 Gamepad - default.ini +[retrogame_joypad] +plugged = True +mouse = False +AnalogDeadzone = 0,0 +AnalogPeak = 32768,32768 +DPad R = button(16) +DPad L = button(15) +DPad D = button(14) +DPad U = button(13) +Start = button(9) +Z Trig = button(6) +B Button = button(3) +A Button = button(0) +C Button R = axis(2+) +C Button L = axis(2-) +C Button D = axis(3+) +C Button U = axis(3-) +R Trig = button(5) +L Trig = button(4) +Mempak switch = +Rumblepak switch = +# Analog axis configuration mappings +X Axis = axis(0-,0+) +Y Axis = axis(1-,1+) \ No newline at end of file diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/zlswap.ini b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/zlswap.ini new file mode 100644 index 000000000..7606cad77 --- /dev/null +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/config/X86_64/zlswap.ini @@ -0,0 +1,25 @@ +; RG552 Gamepad - zlswap.ini +[retrogame_joypad] +plugged = True +mouse = False +AnalogDeadzone = 0,0 +AnalogPeak = 32768,32768 +DPad R = button(16) +DPad L = button(15) +DPad D = button(14) +DPad U = button(13) +Start = button(9) +Z Trig = button(4) +B Button = button(3) +A Button = button(0) +C Button R = axis(2+) +C Button L = axis(2-) +C Button D = axis(3+) +C Button U = axis(3-) +R Trig = button(5) +L Trig = button(6) +Mempak switch = +Rumblepak switch = +# Analog axis configuration mappings +X Axis = axis(0-,0+) +Y Axis = axis(1-,1+) \ No newline at end of file diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk index 37a1f39ad..e5f1ed061 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk index dbe10646b..95cd3ded2 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk index 22e3707a8..0aa64dbee 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk index cbebded84..840fa7f88 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk index d0a19f8e6..0b329e5a5 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk @@ -23,15 +23,19 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi make_target() { - export HOST_CPU=aarch64 + case ${ARCH} in + arm|aarch64) + export HOST_CPU=aarch64 + export USE_GLES=1 + BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" + ;; + esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus - export USE_GLES=1 export SDL_CFLAGS="-I$SYSROOT_PREFIX/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="$TARGET_PREFIX" export V=1 export VC=0 - BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" make -C projects/unix clean make -C projects/unix all ${PKG_MAKE_OPTS_TARGET} } diff --git a/packages/games/emulators/retroarch/gamepads/device/X86_64/retrogame_joypad.cfg b/packages/games/emulators/retroarch/gamepads/device/X86_64/retrogame_joypad.cfg new file mode 100644 index 000000000..af31a293f --- /dev/null +++ b/packages/games/emulators/retroarch/gamepads/device/X86_64/retrogame_joypad.cfg @@ -0,0 +1,44 @@ +input_driver = "udev" +input_device = "retrogame_joypad" +input_vendor_id = "18507" +input_product_id = "4353" +input_a = "x" +input_a_btn = "1" +input_analog_dpad_mode = "0" +input_b = "z" +input_b_btn = "0" +input_down = "down" +input_down_btn = "14" +input_gun_trigger_mbtn = "1" +input_joypad_index = "0" +input_l = "q" +input_l2_btn = "6" +input_l3_btn = "11" +input_l_btn = "4" +input_l_x_minus_axis = "-0" +input_l_x_plus_axis = "+0" +input_l_y_minus_axis = "-1" +input_l_y_plus_axis = "+1" +input_left = "left" +input_left_btn = "15" +input_mouse_index = "0" +input_r = "w" +input_r2_btn = "7" +input_r3_btn = "12" +input_r_btn = "5" +input_r_x_minus_axis = "-2" +input_r_x_plus_axis = "+2" +input_r_y_minus_axis = "-3" +input_r_y_plus_axis = "+3" +input_right = "right" +input_right_btn = "16" +input_select = "rshift" +input_select_btn = "8" +input_start = "enter" +input_start_btn = "9" +input_up = "up" +input_up_btn = "13" +input_x = "s" +input_x_btn = "2" +input_y = "a" +input_y_btn = "3" diff --git a/packages/games/emulators/retroarch/package.mk b/packages/games/emulators/retroarch/package.mk index ecb451ee5..ada7c7137 100644 --- a/packages/games/emulators/retroarch/package.mk +++ b/packages/games/emulators/retroarch/package.mk @@ -44,7 +44,7 @@ pre_configure_target() { esac case ${DEVICE} in - RG351P|RG552) + RG351P|RG552|X86_64L) PKG_DEPENDS_TARGET+=" libgo2" PKG_CONFIGURE_OPTS_TARGET+=" --enable-odroidgo2" ;; diff --git a/packages/games/emulators/yabasanshiroSA/package.mk b/packages/games/emulators/yabasanshiroSA/package.mk index 0fd454d23..ca2f6f33d 100644 --- a/packages/games/emulators/yabasanshiroSA/package.mk +++ b/packages/games/emulators/yabasanshiroSA/package.mk @@ -1,6 +1,6 @@ PKG_NAME="yabasanshiroSA" PKG_VERSION="c7618d2ecbf77b1e8188fa8af4fa1cfb34833a72" -PKG_ARCH="any" +PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/devmiyax/yabause" PKG_URL="${PKG_SITE}.git" diff --git a/packages/games/libretro/mupen64plus-nx/package.mk b/packages/games/libretro/mupen64plus-nx/package.mk index c2144b699..aeb2c71d0 100755 --- a/packages/games/libretro/mupen64plus-nx/package.mk +++ b/packages/games/libretro/mupen64plus-nx/package.mk @@ -8,7 +8,7 @@ PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain nasm:host ${OPENGLES}" +PKG_DEPENDS_TARGET="toolchain nasm:host" PKG_SECTION="libretro" PKG_SHORTDESC="mupen64plus NX" PKG_LONGDESC="mupen64plus NX" @@ -17,6 +17,14 @@ PKG_BUILD_FLAGS="-lto" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + pre_configure_target() { sed -e "s|^GIT_VERSION ?.*$|GIT_VERSION := \" ${PKG_VERSION:0:7}\"|" -i Makefile if [[ "${DEVICE}" =~ RG351 ]] diff --git a/packages/games/libretro/mupen64plus/package.mk b/packages/games/libretro/mupen64plus/package.mk index 75464dacf..c920b08b1 100644 --- a/packages/games/libretro/mupen64plus/package.mk +++ b/packages/games/libretro/mupen64plus/package.mk @@ -27,7 +27,7 @@ PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mupen64plus-libretro" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain nasm:host ${OPENGLES}" +PKG_DEPENDS_TARGET="toolchain nasm:host" PKG_PRIORITY="optional" PKG_SECTION="libretro" PKG_SHORTDESC="mupen64plus + RSP-HLE + GLideN64 + libretro" @@ -36,6 +36,14 @@ PKG_TOOLCHAIN="make" PKG_BUILD_FLAGS="-lto" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + pre_make_target() { export CFLAGS="${CFLAGS} -fcommon" } diff --git a/packages/games/libretro/parallel-n64_glide64/package.mk b/packages/games/libretro/parallel-n64_glide64/package.mk index ae390a420..d523d60e4 100644 --- a/packages/games/libretro/parallel-n64_glide64/package.mk +++ b/packages/games/libretro/parallel-n64_glide64/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/parallel-n64" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain ${OPENGLES} core-info" +PKG_DEPENDS_TARGET="toolchain core-info" PKG_SECTION="libretro" PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." @@ -16,6 +16,14 @@ PKG_TOOLCHAIN="make" PKG_BUILD_FLAGS="-lto" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + if [ "${ARCH}" = "arm" ] then if [[ "${DEVICE}" =~ RG351 ]] diff --git a/packages/games/libretro/parallel-n64_gln64/package.mk b/packages/games/libretro/parallel-n64_gln64/package.mk index e26e0e0d4..73a40ab29 100644 --- a/packages/games/libretro/parallel-n64_gln64/package.mk +++ b/packages/games/libretro/parallel-n64_gln64/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/parallel-n64" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain ${OPENGLES} core-info" +PKG_DEPENDS_TARGET="toolchain core-info" PKG_SECTION="libretro" PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." @@ -16,6 +16,14 @@ PKG_TOOLCHAIN="make" PKG_BUILD_FLAGS="-lto" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + if [ "${ARCH}" = "arm" ] then if [[ "${DEVICE}" =~ RG351 ]] diff --git a/packages/games/libretro/parallel-n64_rice/package.mk b/packages/games/libretro/parallel-n64_rice/package.mk index e87e032a8..9ceb4d556 100644 --- a/packages/games/libretro/parallel-n64_rice/package.mk +++ b/packages/games/libretro/parallel-n64_rice/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/parallel-n64" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain ${OPENGLES} core-info" +PKG_DEPENDS_TARGET="toolchain core-info" PKG_SECTION="libretro" PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus." @@ -16,6 +16,14 @@ PKG_TOOLCHAIN="make" PKG_BUILD_FLAGS="-lto" PKG_PATCH_DIRS+="${DEVICE}" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + if [ "${ARCH}" = "arm" ] then if [[ "${DEVICE}" =~ RG351 ]] diff --git a/packages/graphics/SDL2/package.mk b/packages/graphics/SDL2/package.mk index 5dad0e2e2..dc1d300e6 100644 --- a/packages/graphics/SDL2/package.mk +++ b/packages/graphics/SDL2/package.mk @@ -33,7 +33,7 @@ fi case ${DEVICE} in - RG351P|RG552) + RG351P|RG552|X86_64L) PKG_DEPENDS_TARGET+=" librga" pre_make_host() { sed -i "s| -lrga||g" ${PKG_BUILD}/CMakeLists.txt diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index 8d217dba8..e11ca46b9 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -8,7 +8,7 @@ PKG_VERSION="5.18.10" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host" -PKG_DEPENDS_TARGET="toolchain linux:host kmod:host xz:host keyutils ${KERNEL_EXTRA_DEPENDS_TARGET}" +PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ${KERNEL_EXTRA_DEPENDS_TARGET}" PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_KERNEL_PKG="yes" diff --git a/packages/multimedia/vlc/package.mk b/packages/multimedia/vlc/package.mk index 812bb8846..494258096 100644 --- a/packages/multimedia/vlc/package.mk +++ b/packages/multimedia/vlc/package.mk @@ -33,9 +33,7 @@ ENABLED_FEATURES="--enable-silent-rules \ --enable-libxml2 \ --enable-alsa \ --enable-udev \ - --enable-vlc \ - --enable-gles2 \ - --enable-neon" + --enable-vlc" DISABLED_FEATURES="--disable-dependency-tracking \ --without-contrib \ @@ -124,11 +122,18 @@ DISABLED_FEATURES="--disable-dependency-tracking \ --disable-dav1d \ --disable-qt" - if [ "${PROJECT}" == "Amlogic" ]; then - ENABLED_FEATURES+=" --enable-pulse" - else - DISABLED_FEATURES+=" --disable-pulse" - fi + case ${ARCH} in + arm) + PKG_DEPENDS_TARGET+=" librga ${OPENGLES}" + ENABLED_FEATURES+=" --enable-gles2 --enable-neon" + ;; + aarch64) + PKG_DEPENDS_TARGET+=" librga ${OPENGLES}" + ENABLED_FEATURES+=" --enable-gles2" + ;; + *) + ENABLED_FEATURES+=" ${OPENGL} glu libglvnd" + esac PKG_CONFIGURE_OPTS_TARGET="${ENABLED_FEATURES} ${DISABLED_FEATURES}" diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index d9ed28dc8..577415db5 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -15,18 +15,20 @@ PKG_NEED_UNPACK="busybox" PKG_SHORTDESC="Emulationstation emulator frontend" PKG_BUILD_FLAGS="-gold" GET_HANDLER_SUPPORT="git" +PKG_PATCH_DIRS+="${DEVICE}" if [ ! "${OPENGL}" = "no" ]; then PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + PKG_CMAKE_OPTS_TARGET+=" -DGLES2=0" fi if [ "${OPENGLES_SUPPORT}" = yes ]; then PKG_DEPENDS_TARGET+=" ${OPENGLES}" + PKG_CMAKE_OPTS_TARGET+=" -DGLES2=1" fi -PKG_PATCH_DIRS+="${DEVICE}" -PKG_CMAKE_OPTS_TARGET=" -DENABLE_EMUELEC=1 -DGLES2=1 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0" +PKG_CMAKE_OPTS_TARGET+=" -DENABLE_EMUELEC=1 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0" ########################################################################################################## # The following allows building Emulation station from local copy by using EMULATIONSTATION_SRC. diff --git a/projects/PC/devices/X86_64/device.config b/projects/PC/devices/X86_64/device.config index af81e5060..deb612ef6 100644 --- a/projects/PC/devices/X86_64/device.config +++ b/projects/PC/devices/X86_64/device.config @@ -1,3 +1,3 @@ DEVICE_BRIGHTNESS="100" SPLASH_LOADER="imagemagick" -#UI_SERVICE="systemctl start emustation.service" +UI_SERVICE="systemctl start emustation.service" diff --git a/projects/PC/devices/X86_64/options b/projects/PC/devices/X86_64/options index b7a4d8ac8..7ca8bc9ae 100644 --- a/projects/PC/devices/X86_64/options +++ b/projects/PC/devices/X86_64/options @@ -20,7 +20,7 @@ DISPLAYSERVER="x11" # Windowmanager to use (fluxbox / weston / no) - WINDOWMANAGER="fluxbox" +# WINDOWMANAGER="fluxbox" # Mesa 3D Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,vmware,virtio) # Space separated list is supported,