diff --git a/pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO b/pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO index bc91379..351f5de 100644 --- a/pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO +++ b/pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = lib32-nvidia-580xx-utils - pkgver = 580.126.09 + pkgver = 580.126.18 pkgrel = 1 url = http://www.nvidia.com/ arch = x86_64 license = custom options = !strip - source = https://us.download.nvidia.com/XFree86/Linux-x86_64/580.126.09/NVIDIA-Linux-x86_64-580.126.09.run - sha512sums = d5c41131304b29d55d0caf8cd84c95b454d81e68d7b23ca893504c63d84dd78726e2dbd7f076b7f12be518e641d110d131ac178336d61a00bcc81b7a1890799d + source = https://download.nvidia.com/XFree86/Linux-x86_64/580.126.18/NVIDIA-Linux-x86_64-580.126.18.run + sha512sums = 3007896838256c5534d7a04958f38f2837314b09d05e595966ba68789b0166fd8c1a574b29c8dd9ee5414822c9aebad9f9c7e5db777b811701fcac2b92245f0f pkgname = lib32-nvidia-580xx-utils pkgdesc = NVIDIA drivers utilities (32-bit) (580xx) @@ -17,7 +17,7 @@ pkgname = lib32-nvidia-580xx-utils provides = lib32-vulkan-driver provides = lib32-opengl-driver provides = lib32-nvidia-libgl - provides = lib32-nvidia-utils=580.126.09 + provides = lib32-nvidia-utils=580.126.18 conflicts = lib32-nvidia-libgl conflicts = lib32-nvidia-utils replaces = lib32-nvidia-libgl @@ -28,5 +28,5 @@ pkgname = lib32-opencl-nvidia-580xx depends = lib32-gcc-libs optdepends = opencl-headers: headers necessary for OpenCL development provides = lib32-opencl-driver - provides = lib32-opencl-nvidia=580.126.09 + provides = lib32-opencl-nvidia=580.126.18 conflicts = lib32-opencl-nvidia diff --git a/pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD b/pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD index b9484b6..332e993 100644 --- a/pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD +++ b/pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=lib32-nvidia-580xx-utils pkgname=('lib32-nvidia-580xx-utils' 'lib32-opencl-nvidia-580xx') -pkgver=580.126.09 +pkgver=580.126.18 pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" @@ -13,8 +13,8 @@ url="http://www.nvidia.com/" license=('custom') options=('!strip') _pkg="NVIDIA-Linux-x86_64-${pkgver}" -source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run") -sha512sums=('d5c41131304b29d55d0caf8cd84c95b454d81e68d7b23ca893504c63d84dd78726e2dbd7f076b7f12be518e641d110d131ac178336d61a00bcc81b7a1890799d') +source=("https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run") +sha512sums=('3007896838256c5534d7a04958f38f2837314b09d05e595966ba68789b0166fd8c1a574b29c8dd9ee5414822c9aebad9f9c7e5db777b811701fcac2b92245f0f') create_links() { # create soname links diff --git a/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore b/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore index acefa93..1d65adf 100644 --- a/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore +++ b/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore @@ -1,5 +1,3 @@ * !PKGBUILD !.SRCINFO -!patches/ -!patches/** diff --git a/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD b/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD index 0b60ed0..8d79746 100644 --- a/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD +++ b/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD @@ -4,7 +4,7 @@ pkgname="limine-mkinitcpio-hook" _pkgver=1.30.0 _extver="" #_extver="_1" pkgver="${_pkgver}${_extver}" -pkgrel=2 +pkgrel=1 pkgdesc="Install kernels for the Limine bootloader." arch=('x86_64' 'aarch64') url="https://gitlab.com/Zesko/limine-entry-tool" diff --git a/pkgbuilds/edge/limine-snapper-sync/.SRCINFO b/pkgbuilds/edge/limine-snapper-sync/.SRCINFO index e212bac..7db0d54 100644 --- a/pkgbuilds/edge/limine-snapper-sync/.SRCINFO +++ b/pkgbuilds/edge/limine-snapper-sync/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = limine-snapper-sync pkgdesc = Automatically syncs Limine snapshot entries with Snapper snapshots. - pkgver = 1.22.2 + pkgver = 1.23.0 pkgrel = 1 url = https://gitlab.com/Zesko/limine-snapper-sync arch = x86_64 @@ -23,8 +23,8 @@ pkgbase = limine-snapper-sync options = !debug options = !strip backup = etc/limine-snapper-sync.conf - source = limine-snapper-sync::git+https://gitlab.com/Zesko/limine-snapper-sync.git#tag=1.22.2 - sha256sums = b9eff32f046c21fe3415b39ec0da24d631edc596b6b1c634f7eb59efa9953aef + source = limine-snapper-sync::git+https://gitlab.com/Zesko/limine-snapper-sync.git#tag=1.23.0 + sha256sums = 2f19f2c2d510990fccffe34ee5c730f40b50e35f37bf1828831cd0d44f7b70cc source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-x64_bin.tar.gz sha256sums_x86_64 = e0be791c8fda4d03b6b0a0cb824fef3149736170057b3a515252b44419606af0 source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-aarch64_bin.tar.gz diff --git a/pkgbuilds/edge/limine-snapper-sync/PKGBUILD b/pkgbuilds/edge/limine-snapper-sync/PKGBUILD index bbc1f9f..89fe8b8 100644 --- a/pkgbuilds/edge/limine-snapper-sync/PKGBUILD +++ b/pkgbuilds/edge/limine-snapper-sync/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Zesko pkgname="limine-snapper-sync" -pkgver=1.22.2 +pkgver=1.23.0 pkgrel=1 pkgdesc="Automatically syncs Limine snapshot entries with Snapper snapshots." arch=('x86_64' 'aarch64') @@ -28,7 +28,7 @@ optdepends=( makedepends=('git' 'gradle') backup=(etc/limine-snapper-sync.conf) conflicts=('limine-snapper-sync-git') -sha256sums=('b9eff32f046c21fe3415b39ec0da24d631edc596b6b1c634f7eb59efa9953aef') +sha256sums=('2f19f2c2d510990fccffe34ee5c730f40b50e35f37bf1828831cd0d44f7b70cc') sha256sums_x86_64=('e0be791c8fda4d03b6b0a0cb824fef3149736170057b3a515252b44419606af0') sha256sums_aarch64=('b4580d9f223d0a4b3a1757e58b18ff4c1db950e67e105fc5cb741457d2384a71') @@ -45,6 +45,7 @@ build() { cd "$srcdir/${pkgname}" export GRAALVM_HOME="$srcdir/${_graalvm_version}" export JAVA_HOME="${GRAALVM_HOME}" + export NATIVE_IMAGE_OPTIONS="-march=compatibility" /usr/bin/gradle clean nativeCompile -Dorg.gradle.java.home="${JAVA_HOME}" } diff --git a/pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO b/pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO index 65a27a7..c17c1bb 100644 --- a/pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO +++ b/pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = nvidia-580xx-utils - pkgver = 580.126.09 + pkgver = 580.126.18 pkgrel = 2 url = http://www.nvidia.com/ arch = x86_64 @@ -11,9 +11,8 @@ pkgbase = nvidia-580xx-utils source = systemd-homed-override.conf source = systemd-suspend-override.conf source = nvidia-sleep.conf - source = https://us.download.nvidia.com/XFree86/Linux-x86_64/580.126.09/NVIDIA-Linux-x86_64-580.126.09.run + source = https://download.nvidia.com/XFree86/Linux-x86_64/580.126.18/NVIDIA-Linux-x86_64-580.126.18.run source = 0001-Enable-atomic-kernel-modesetting-by-default.patch - source = 0002-Fix-compile-for-6.19.patch source = limit-vram-usage sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d sha256sums = f77a5247a3ba63e9fad3a3b2822d0fcfa51e0f79b5a90bd79bf08ea34b64ab07 @@ -21,9 +20,8 @@ pkgbase = nvidia-580xx-utils sha256sums = c5aa7b8abe69e72bfdc6b9ee8afbfd350bcc557e894558f2e6e4087fa9aa0dd8 sha256sums = 1d053c5078387021338cfc3a732bed61be1a20a549775573788e9134775c8149 sha256sums = 12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631 - sha256sums = 4cac53e48f8adff661d47c8788ed24059a248c9fd8098ceafd088a498986ec26 + sha256sums = a7781b2e1c2d65c6580914c76e79ed454d02945df84711c033070a092a9ab49d sha256sums = 163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009 - sha256sums = fdfe224fa39b2707942a89a54e1c0d60c5eb7da20b7a3e1dfde294e5bdec237e sha256sums = b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a pkgname = nvidia-580xx-utils @@ -55,7 +53,7 @@ pkgname = opencl-nvidia-580xx pkgname = nvidia-580xx-dkms pkgdesc = NVIDIA kernel modules - module sources (580xx) depends = dkms - depends = nvidia-580xx-utils=580.126.09 + depends = nvidia-580xx-utils=580.126.18 depends = libglvnd provides = NVIDIA-MODULE provides = nvidia diff --git a/pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD b/pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD index 465d2f2..10f1baf 100644 --- a/pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD +++ b/pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=nvidia-580xx-utils pkgname=('nvidia-580xx-utils' 'opencl-nvidia-580xx' 'nvidia-580xx-dkms') -pkgver=580.126.09 +pkgver=580.126.18 pkgrel=2 arch=('x86_64') url="http://www.nvidia.com/" @@ -21,9 +21,8 @@ source=('nvidia-drm-outputclass.conf' 'systemd-homed-override.conf' 'systemd-suspend-override.conf' 'nvidia-sleep.conf' - "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" + "https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" '0001-Enable-atomic-kernel-modesetting-by-default.patch' - '0002-Fix-compile-for-6.19.patch' 'limit-vram-usage') sha256sums=( @@ -33,9 +32,8 @@ sha256sums=( 'c5aa7b8abe69e72bfdc6b9ee8afbfd350bcc557e894558f2e6e4087fa9aa0dd8' '1d053c5078387021338cfc3a732bed61be1a20a549775573788e9134775c8149' '12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631' - '4cac53e48f8adff661d47c8788ed24059a248c9fd8098ceafd088a498986ec26' + 'a7781b2e1c2d65c6580914c76e79ed454d02945df84711c033070a092a9ab49d' '163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009' - 'fdfe224fa39b2707942a89a54e1c0d60c5eb7da20b7a3e1dfde294e5bdec237e' 'b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a' ) @@ -60,9 +58,6 @@ prepare() { # https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_pkg}/kernel" - # Fix compilation for 6.19 - patch -Np1 -i "${srcdir}/0002-Fix-compile-for-6.19.patch" - shopt -s globstar for conf in "${srcdir}"/**/dkms.conf; do sed -i "s/__VERSION_STRING/${pkgver}/" "$conf" diff --git a/pkgbuilds/edge/yt6801-dkms/.SRCINFO b/pkgbuilds/edge/yt6801-dkms/.SRCINFO index fe42035..b33452a 100644 --- a/pkgbuilds/edge/yt6801-dkms/.SRCINFO +++ b/pkgbuilds/edge/yt6801-dkms/.SRCINFO @@ -1,16 +1,14 @@ pkgbase = yt6801-dkms pkgdesc = Kernel module for Motorcomm YT6801 ethernet controller (DKMS) pkgver = 1.0.31 - pkgrel = 1 + pkgrel = 2 url = https://www.motor-comm.com/product/ethernet-control-chip arch = x86_64 license = GPL-2.0-or-later depends = dkms source = yt6801-1.0.31.zip::https://www.motor-comm.com/Cn/Skippower/downloadFile.html?id=1817 - source = fix.patch - source = drop-flags.patch + source = patch.diff sha256sums = 9ea62182bd520483df5fd3ec320262cbdddcc763f3128ae37abd26905a97e14c - sha256sums = 3e850f2d35fd3da6d10035b5ea04e995a0d7962b1c02599b42f1f7a296822e78 - sha256sums = 814c6a121b392f512ec4c8898dd9f6c50ae3ff9d946bc1d115135fa6f5c6a897 + sha256sums = 6cdb77774c483b640c8f0499fd54a79e773cd3f96a426cd99eec385972d9d5bb pkgname = yt6801-dkms diff --git a/pkgbuilds/edge/yt6801-dkms/PKGBUILD b/pkgbuilds/edge/yt6801-dkms/PKGBUILD index efc0605..23b1076 100644 --- a/pkgbuilds/edge/yt6801-dkms/PKGBUILD +++ b/pkgbuilds/edge/yt6801-dkms/PKGBUILD @@ -3,25 +3,22 @@ _pkgbase=yt6801 pkgname=yt6801-dkms pkgver=1.0.31 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel module for Motorcomm YT6801 ethernet controller (DKMS)" arch=('x86_64') url="https://www.motor-comm.com/product/ethernet-control-chip" license=('GPL-2.0-or-later') depends=('dkms') source=(${_pkgbase}-${pkgver}.zip::'https://www.motor-comm.com/Cn/Skippower/downloadFile.html?id=1817' - 'fix.patch' - 'drop-flags.patch') + 'patch.diff') sha256sums=('9ea62182bd520483df5fd3ec320262cbdddcc763f3128ae37abd26905a97e14c' - '3e850f2d35fd3da6d10035b5ea04e995a0d7962b1c02599b42f1f7a296822e78' - '814c6a121b392f512ec4c8898dd9f6c50ae3ff9d946bc1d115135fa6f5c6a897') + '6cdb77774c483b640c8f0499fd54a79e773cd3f96a426cd99eec385972d9d5bb') prepare() { cd ${srcdir} mkdir src tar -zxf ${_pkgbase}-${pkgver}.tar.gz -C src - patch -p1 < drop-flags.patch - patch -p1 < fix.patch + patch -p1 < patch.diff } package() { diff --git a/pkgbuilds/edge/yt6801-dkms/patch.diff b/pkgbuilds/edge/yt6801-dkms/patch.diff new file mode 100644 index 0000000..daebe0e --- /dev/null +++ b/pkgbuilds/edge/yt6801-dkms/patch.diff @@ -0,0 +1,78 @@ +diff --git a/src/dkms.conf b/src/dkms.conf +index 78eaf8b..9d93675 100644 +--- a/src/dkms.conf ++++ b/src/dkms.conf +@@ -1,8 +1,5 @@ + PACKAGE_NAME="yt6801" + PACKAGE_VERSION="1.0.31" +-CLEAN="make clean" +-MAKE[0]="make" + BUILT_MODULE_NAME[0]="yt6801" + DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ethernet/motorcomm" + AUTOINSTALL="yes" +-REMAKE_INITRD="yes" +diff --git a/src/fuxi-gmac-net.c b/src/fuxi-gmac-net.c +index 3e643f9..fea4c97 100644 +--- a/src/fuxi-gmac-net.c ++++ b/src/fuxi-gmac-net.c +@@ -771,7 +771,9 @@ static void fxgmac_tx_hang_timer_handler(struct timer_list *t) + static void fxgmac_tx_hang_timer_handler(unsigned long data) + #endif + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0)) ++ struct fxgmac_channel *channel = timer_container_of(channel, t, expansion.tx_hang_timer); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) + struct fxgmac_channel *channel = from_timer(channel, t, expansion.tx_hang_timer); + #else + struct fxgmac_channel *channel = (struct fxgmac_channel *)data; +diff --git a/src/fuxi-gmac-phy.c b/src/fuxi-gmac-phy.c +index 36d4fb3..8bd9533 100644 +--- a/src/fuxi-gmac-phy.c ++++ b/src/fuxi-gmac-phy.c +@@ -324,7 +324,9 @@ static void fxgmac_phy_link_poll(struct timer_list *t) + static void fxgmac_phy_link_poll(unsigned long data) + #endif + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0)) ++ struct fxgmac_pdata *pdata = timer_container_of(pdata, t, expansion.phy_poll_tm); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) + struct fxgmac_pdata *pdata = from_timer(pdata, t, expansion.phy_poll_tm); + #else + struct fxgmac_pdata *pdata = (struct fxgmac_pdata*)data; +@@ -352,7 +354,9 @@ static void fxgmac_phy_link_poll(unsigned long data) + + int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata) + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0)) ++ timer_init_key(&pdata->expansion.phy_poll_tm, NULL, 0, "fuxi_phy_link_update_timer", NULL); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) + init_timer_key(&pdata->expansion.phy_poll_tm, NULL, 0, "fuxi_phy_link_update_timer", NULL); + #else + init_timer_key(&pdata->expansion.phy_poll_tm, 0, "fuxi_phy_link_update_timer", NULL); +@@ -370,6 +374,10 @@ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata) + + void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)) ++ timer_shutdown_sync(&pdata->expansion.phy_poll_tm); ++#else + del_timer_sync(&pdata->expansion.phy_poll_tm); ++#endif + DPRINTK("fxgmac_phy_timer removed\n"); + } +diff --git a/src/fuxi-gmac.h b/src/fuxi-gmac.h +index 539b507..2435f0c 100644 +--- a/src/fuxi-gmac.h ++++ b/src/fuxi-gmac.h +@@ -50,6 +50,8 @@ + #define FXGMAC_NS_IFA_LOCAL_LINK 1 + #define FXGMAC_NS_IFA_GLOBAL_UNICAST 2 + ++#define FXGMAC_INT_MODERATION_ENABLED 1 ++ + #define FXGMAX_ASPM_WAR_EN + /* Descriptor related parameters */ + #if FXGMAC_TX_HANG_TIMER_ENABLED