work in progress does not compile

diff --git a/config.txt b/config.txt
index 926d7a197f8f1859be493d05b65b132a597a639e..6b4bc7235e36acfda5c259a0a59b64995b4a48f1 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -1,3 +1,4 @@
+CONFIG_VIDEO_APPLE_ISP=y

 CONFIG_HID_ACRUX_FF=y
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_IP_NF_ARPTABLES=m

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index e32bcde98b59a478013e03839cb260c1f6bd4e97..46d203df69a07796aefd18c58b5e83667204b521 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,13 +16,15 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
 unset LC_CTYPE
 unset LANG
 

+export M1N1_VERSION=1.4.0
+

 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t

-        git reset --hard asahi-6.4-9;
+        git reset --hard asahi-6.5-8;

         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig


@@ -36,7 +38,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t

-        git reset --hard v1.3.3;
+        git reset --hard v{M1N1_VERSION};

         make -j `nproc`
 )
 }
         make -j `nproc`
 )
 }


@@ -58,7 +60,6 @@ build_uboot()
 package_boot_bin()
 {
 (
 package_boot_bin()
 {
 (

-        export M1N1_VERSION=1.3.3

         rm -rf m1n1_${M1N1_VERSION}_arm64
         mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/
         cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin
         rm -rf m1n1_${M1N1_VERSION}_arm64
         mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/
         cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin

diff --git a/mesa-debian/libglx-mesa0.symbols b/mesa-debian/libglx-mesa0.symbols
index efbdf3516c8fc8682536285d803d8bef8eb962d7..1c55e10b6fdd58e5c9a697106ac98e61482c1085 100644 (file)
--- a/mesa-debian/libglx-mesa0.symbols
+++ b/mesa-debian/libglx-mesa0.symbols
@@ -1,5 +1,6 @@
 libGLX_mesa.so.0 libglx-mesa0
  (arch=!hurd-any)MesaGLInteropGLXExportObject@Base 12.0.4
 libGLX_mesa.so.0 libglx-mesa0
  (arch=!hurd-any)MesaGLInteropGLXExportObject@Base 12.0.4

+ MesaGLInteropGLXFlushObjects@Base 23.0.0-202310051942

  (arch=!hurd-any)MesaGLInteropGLXQueryDeviceInfo@Base 12.0.4
  __glx_Main@Base 17.0.0~
  glAccum@Base 0
  (arch=!hurd-any)MesaGLInteropGLXQueryDeviceInfo@Base 12.0.4
  __glx_Main@Base 17.0.0~
  glAccum@Base 0

diff --git a/mesa.sh b/mesa.sh
index 636a234b585853cd3d89b2828a3496cb84349963..166268d6c979ae2134906c5c4ac0f5d684513808 100644 (file)
--- a/mesa.sh
+++ b/mesa.sh
@@ -25,7 +25,7 @@ git fetch -a -t
 # the latest mesa tag will be in sync with the latest kernel tag and usually
 # also the latest live kernel (except when I'm about to do a release)
 # 17:18 <marcan> if those two desync it'll refuse to initialize
 # the latest mesa tag will be in sync with the latest kernel tag and usually
 # also the latest live kernel (except when I'm about to do a release)
 # 17:18 <marcan> if those two desync it'll refuse to initialize

-git reset --hard asahi-20230821
+git reset --hard asahi-20230904

 rm -rf debian
 cp -a ../../mesa-debian debian
 EMAIL=thomas@glanzmann.de dch -v 23.0.0-`date +%Y%m%d%H%M` 'asahi wip'
 rm -rf debian
 cp -a ../../mesa-debian debian
 EMAIL=thomas@glanzmann.de dch -v 23.0.0-`date +%Y%m%d%H%M` 'asahi wip'

diff --git a/prepare_rust.sh b/prepare_rust.sh
index bbe184e16b5d7def7271b435c309845935e31b88..01ff887ccbe69015bc16fbae9ed11355b0a3a74c 100644 (file)
--- a/prepare_rust.sh
+++ b/prepare_rust.sh
@@ -16,8 +16,8 @@ export RUSTUP_HOME="$(pwd)/build/rust"
 rm -rf ${CARGO_HOME} ${RUSTUP_HOME}
 curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain none
 source "$(pwd)/build/cargo/env"
 rm -rf ${CARGO_HOME} ${RUSTUP_HOME}
 curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain none
 source "$(pwd)/build/cargo/env"

-rustup override set 1.68.2
+rustup override set 1.72.0

 rustup component add rust-src
 rustup component add rust-src

-cargo install --locked --version 0.56.0 bindgen
+cargo install --locked --version 0.68.1 bindgen-cli

 rustup component add rustfmt
 rustup component add clippy
 rustup component add rustfmt
 rustup component add clippy