Merge pull request #402 from fewtarius/dev

Dev
This commit is contained in:
fewtarius 2022-08-31 19:11:57 -04:00 committed by GitHub
commit 92787368fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 72 additions and 63 deletions

View file

@ -4,7 +4,7 @@
PKG_NAME="mupen64plus-nx" PKG_NAME="mupen64plus-nx"
PKG_VERSION="4684cfa56ae7752be284eaaa165c1dc34ec63eb7" PKG_VERSION="4684cfa56ae7752be284eaaa165c1dc34ec63eb7"
PKG_SHA256="01d63e3f3ecebcb207a5176117f5ad8623c5b3be8c99161695e843e9dea7ee42" PKG_SHA256="01d63e3f3ecebcb207a5176117f5ad8623c5b3be8c99161695e843e9dea7ee42"
PKG_ARCH="any" PKG_ARCH="arm aarch64"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx" PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
@ -26,17 +26,18 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi fi
pre_configure_target() { pre_configure_target() {
sed -e "s|^GIT_VERSION ?.*$|GIT_VERSION := \" ${PKG_VERSION:0:7}\"|" -i Makefile sed -e "s|^GIT_VERSION ?.*$|GIT_VERSION := \" ${PKG_VERSION:0:7}\"|" -i Makefilea
if [[ "${DEVICE}" =~ RG351 ]] case ${DEVICE} in
then RG351P|RG351V|RG351MP)
PKG_MAKE_OPTS_TARGET=" platform=RK3326" PKG_MAKE_OPTS_TARGET=" platform=RK3326"
elif [[ "${DEVICE}" =~ RG552 ]] ;;
then RG552)
PKG_MAKE_OPTS_TARGET=" platform=RK3399" PKG_MAKE_OPTS_TARGET=" platform=RK3399"
elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]] ;;
then RG503|RG353P)
PKG_MAKE_OPTS_TARGET=" platform=RK3566" PKG_MAKE_OPTS_TARGET=" platform=RK3566"
fi ;;
esac
} }
makeinstall_target() { makeinstall_target() {

View file

@ -6,6 +6,7 @@ PKG_VERSION="28ef8ff960efef4fc3c462ddc52707e140fee3be"
PKG_SHA256="25689b7c30a8706979eadbeb971107ea3159d4763f50870d79b4e84548b5ee66" PKG_SHA256="25689b7c30a8706979eadbeb971107ea3159d4763f50870d79b4e84548b5ee66"
PKG_REV="2" PKG_REV="2"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_ARCH="arm aarch64"
PKG_SITE="https://github.com/libretro/parallel-n64" PKG_SITE="https://github.com/libretro/parallel-n64"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain core-info" PKG_DEPENDS_TARGET="toolchain core-info"
@ -17,29 +18,31 @@ PKG_BUILD_FLAGS="-lto"
PKG_PATCH_DIRS+="${DEVICE}" PKG_PATCH_DIRS+="${DEVICE}"
if [ ! "${OPENGL}" = "no" ]; then if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
fi fi
if [ "${OPENGLES_SUPPORT}" = yes ]; then if [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_DEPENDS_TARGET+=" ${OPENGLES}"
fi fi
if [ "${ARCH}" = "arm" ]
then case ${ARCH} in
if [[ "${DEVICE}" =~ RG351 ]] arm)
then case ${DEVICE} in
PKG_MAKE_OPTS_TARGET=" platform=RG351x" RG351P|RG351V|RG351MP)
elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]] PKG_MAKE_OPTS_TARGET=" platform=RG351x"
then ;;
PKG_MAKE_OPTS_TARGET+=" platform=RK3566" RG503|RG353P)
else PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}" ;;
fi esac
else ;;
make_target() { aarch64)
: make_target() {
} :
fi }
;;
esac
pre_configure_target() { pre_configure_target() {
sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Glide64";/g' ${PKG_BUILD}/libretro/libretro.c sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Glide64";/g' ${PKG_BUILD}/libretro/libretro.c
@ -52,12 +55,14 @@ pre_configure_target() {
makeinstall_target() { makeinstall_target() {
mkdir -p ${INSTALL}/usr/lib/libretro mkdir -p ${INSTALL}/usr/lib/libretro
if [[ "${ARCH}" == "aarch64" ]] case ${ARCH} in
then arm)
cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_glide64-*/.install_pkg/usr/lib/libretro/parallel_n64_glide64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so
cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info ;;
sed -i 's/ParaLLEl N64/ParaLLEl N64 Glide64/g' ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info *)
else cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_glide64-*/.install_pkg/usr/lib/libretro/parallel_n64_glide64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so
cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info
fi sed -i 's/ParaLLEl N64/ParaLLEl N64 Glide64/g' ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info
;;
esac
} }

View file

@ -25,22 +25,23 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_DEPENDS_TARGET+=" ${OPENGLES}"
fi fi
if [ "${ARCH}" = "arm" ] case ${ARCH} in
then arm)
if [[ "${DEVICE}" =~ RG351 ]] case ${DEVICE} in
then RG351P|RG351V|RG351MP)
PKG_MAKE_OPTS_TARGET=" platform=RG351x" PKG_MAKE_OPTS_TARGET=" platform=RG351x"
elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]] ;;
then RG503|RG353P)
PKG_MAKE_OPTS_TARGET+=" platform=RK3566" PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
else ;;
PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}" esac
fi ;;
else aarch64)
make_target() { make_target() {
: :
} }
fi ;;
esac
pre_configure_target() { pre_configure_target() {
sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Rice";/g' ${PKG_BUILD}/libretro/libretro.c sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Rice";/g' ${PKG_BUILD}/libretro/libretro.c
@ -53,12 +54,14 @@ pre_configure_target() {
makeinstall_target() { makeinstall_target() {
mkdir -p ${INSTALL}/usr/lib/libretro mkdir -p ${INSTALL}/usr/lib/libretro
if [[ "${ARCH}" == "aarch64" ]] case ${ARCH} in
then arm)
cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_rice-*/.install_pkg/usr/lib/libretro/parallel_n64_rice_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so
cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info ;;
sed -i 's/ParaLLEl N64/ParaLLEl N64 Rice/g' ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info *)
else cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_rice-*/.install_pkg/usr/lib/libretro/parallel_n64_rice_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so
cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info
fi sed -i 's/ParaLLEl N64/ParaLLEl N64 Rice/g' ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info
;;
esac
} }

View file

@ -6,7 +6,7 @@ PKG_NAME="pcsx_rearmed"
PKG_VERSION="d38927c1a43f654a6e9e7fc60c837bd35c3497f7" PKG_VERSION="d38927c1a43f654a6e9e7fc60c837bd35c3497f7"
PKG_SHA256="c825a355bd2f36f5bc71054eeb1c0df8182056cee0b761cd0ad8bd66d719af63" PKG_SHA256="c825a355bd2f36f5bc71054eeb1c0df8182056cee0b761cd0ad8bd66d719af63"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="arm aarch64"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/pcsx_rearmed" PKG_SITE="https://github.com/libretro/pcsx_rearmed"
PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"

View file

@ -12,7 +12,7 @@ PKG_SHORTDESC="Zero config VPN. Installs on any device in minutes, manages firew
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
case ${TARGET_ARCH} in case ${TARGET_ARCH} in
RG351P|RG351V|RG351MP|RG503|RG353P) RG351P|RG351V|RG351MP|RG503|RG353P|RG552)
PKG_DEPENDS_TARGET+=" wireguard-linux-compat" PKG_DEPENDS_TARGET+=" wireguard-linux-compat"
;; ;;
esac esac