Merge pull request #262 from fewtarius/dev

Fix libgo2 dependency, clean packages with device specific config.
This commit is contained in:
fewtarius 2022-07-15 06:19:20 -04:00 committed by GitHub
commit f6e6223635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions

View file

@ -29,18 +29,28 @@ pre_configure_target() {
--enable-sdl2 \
--enable-ffmpeg"
if [ "${ARCH}" == "arm" ] || [ "${ARCH}" == "aarch64" ]
then
case ${ARCH} in
arm)
PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
PKG_DEPENDS_TARGET+=" librga ${OPENGLES}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev --enable-odroidgo2"
else
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev"
;;
aarch64)
PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
PKG_DEPENDS_TARGET+=" librga ${OPENGLES}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev"
;;
*)
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd vulkan-loader vulkan-headers"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengl --enable-vulkan --enable-vulkan_display"
fi
esac
if [ "${ARCH}" == "arm" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
fi
case ${DEVICE} in
RG351P)
PKG_DEPENDS_TARGET+=" libgo2"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-odroidgo2"
;;
esac
cd ${PKG_BUILD}
}

View file

@ -38,6 +38,12 @@ then
ln -sf build.${DISTRO}-${ROOT}.${ARCH} build.${DISTRO}-${DEVICE}.${ARCH}
fi
# Clean packages that have device specific configurations.
PKG_CLEAN="${PKG_CLEAN} mupen64plus-nx mupen64plus flycast_libretro dosbox-pure parallel-n64_glide64 \
parallel-n64_gln64 parallel-n64_rice pcsx_rearmed pcsx_rearmed gpsp raze amiberry lzdoom \
PPSSPPSDL gzdoom mupen64plussa-core mupen64plussa-input-sdl 351files libgo2 \
gamecontrollerdb"
# Clean additional packages to ensure the OS is properly built for this device
PKG_CLEAN="${PKG_CLEAN} plymouth-lite initramfs busybox kernel grub u-boot SDL2"
fi