Merge pull request #856 from fewtarius/dev

Fix apache-ant, and u-boot on Apple M1 (Ubuntu 22.04/UTM).  Fix parallel-n64 patch and dependencies.

packages/devel/apache-ant/package.mk

@@ -3,18 +3,17 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="apache-ant"
-PKG_VERSION="1.10.7"
-PKG_SHA256="c8d68b396d9e44b49668bafe0c82f8c89497915254b5395d73d6f6e41d7a0e25"
+PKG_VERSION="1.10.12"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
 PKG_URL="https://archive.apache.org/dist/ant/source/${PKG_NAME}-${PKG_VERSION}-src.tar.xz"
-PKG_DEPENDS_HOST="jdk-x86_64-zulu:host"
+PKG_DEPENDS_HOST="jdk-zulu:host"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"
 
 make_host() {
   (
-  export JAVA_HOME=$(get_build_dir jdk-x86_64-zulu)
+  export JAVA_HOME=$(get_build_dir jdk-zulu)
 
   ./bootstrap.sh
   ./bootstrap/bin/ant -f fetch.xml -Ddest=optional

packages/games/libretro/parallel-n64/package.mk

@@ -18,7 +18,7 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_DEPENDS_TARGET+=" ${OPENGLES} libglu"
 fi
 
 case ${DEVICE} in

packages/games/libretro/parallel-n64/patches/002-add-platform.patch

@@ -25,7 +25,7 @@ index 8a719d55..bc243d06 100644
 +   endif
 +
 +   # RK3356
-+   ifneq (,$(findstring RK3326,$(platform)))
++   ifneq (,$(findstring RK3566,$(platform)))
 +      TARGET := $(TARGET_NAME)_libretro.so
 +      CPUFLAGS += -DARM_FIX -DCLASSIC
 +      GLES = 1

packages/lang/jdk-x86_64-zulu/package.mk

@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
-
-PKG_NAME="jdk-x86_64-zulu"
-PKG_VERSION="8.38.0.13-8.0.212"
-PKG_SHA256="568e7578f1b20b1e62a8ed2c374bad4eb0e75d221323ccfa6ba8d7bc56cf33cf"
-PKG_LICENSE="GPLv2"
-PKG_SITE="https://www.azul.com/products/zulu-enterprise/"
-PKG_URL="https://cdn.azul.com/zulu/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_x64.tar.gz"
-PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
-PKG_TOOLCHAIN="manual"
-
-post_unpack() {
-  rm -f $PKG_BUILD/src.zip
-}

packages/lang/jdk-zulu/package.mk

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="jdk-zulu"
+PKG_VERSION="18.32.13-ca-jdk18.0.2.1"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-enterprise/"
+
+case ${TARGET_ARCH} in
+  aarch64)
+    ZULUARCH="aarch64"
+  ;;
+  x86_64)
+    ZULUARCH="x64"
+  ;;
+esac
+
+PKG_URL="https://cdn.azul.com/zulu/bin/zulu${PKG_VERSION}-linux_${ZULUARCH}.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f ${PKG_BUILD}/src.zip
+}

projects/Rockchip/packages/u-boot/package.mk

@@ -19,7 +19,7 @@ case ${DEVICE} in
   ;;
   RG353P|RG503)
     PKG_URL="${PKG_SITE}/rk356x-uboot.git"
-    PKG_VERSION="62a0e69"
+    PKG_VERSION="b2b0125"
   ;;
 esac
 
@@ -52,12 +52,10 @@ make_target() {
     [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
     if [ "${PKG_SOC}" = "rk356x" ]
     then
-      cd ${PKG_BUILD}
-      git checkout make.sh
       echo "Making for GPT (${UBOOT_DTB})..."
       sed -i "s|TOOLCHAIN_ARM64=.*|TOOLCHAIN_ARM64=${TOOLCHAIN}/bin|" make.sh
       sed -i "s|aarch64-linux-gnu|${TARGET_NAME}|g" make.sh
-      sed -i "s|../rkbin|$(get_build_dir rkbin)|" make.sh
+      sed -i "s|RKBIN_TOOLS=../rkbin/tools|RKBIN_TOOLS=$(get_build_dir rkbin)/tools|" make.sh
       ./make.sh ${UBOOT_DTB}
     else
       echo "Building for MBR (${UBOOT_DTB})..."