pyrox.dev
linuxPackages_6_15.ajantv2: fix build
+5
pkgs/os-specific/linux/ajantv2/default.nix
+5
pkgs/os-specific/linux/ajantv2/default.nix
+61
pkgs/os-specific/linux/ajantv2/fix-linux-6.15.patch
+61
pkgs/os-specific/linux/ajantv2/fix-linux-6.15.patch
···
1
+
From 8eacfa908f7d9b366d68e0ea0516fdd867a1e492 Mon Sep 17 00:00:00 2001
2
+
From: Luke Granger-Brown <git@lukegb.com>
3
+
Date: Sun, 22 Jun 2025 19:38:10 +0100
4
+
Subject: [PATCH 5/5] Use ccflags-y instead of EXTRA_CFLAGS, which stopped
5
+
working in Linux 6.15
6
+
7
+
---
8
+
driver/linux/Makefile | 14 +++++++-------
9
+
1 file changed, 7 insertions(+), 7 deletions(-)
10
+
11
+
diff --git a/driver/linux/Makefile b/driver/linux/Makefile
12
+
index f714ff9b..da4ee90b 100644
13
+
--- a/driver/linux/Makefile
14
+
+++ b/driver/linux/Makefile
15
+
@@ -25,10 +25,10 @@ VERSIONING = -DSDKVER_MAJ=$(SDKVER_MAJ) -DSDKVER_MIN=$(SDKVER_MIN) -DSDKVER_PN
16
+
DISTRO_INFO = -DDISTRO_TYPE=$(DISTRO_TYPE) -DDISTRO_IS_RHEL_LIKE=$(DISTRO_IS_RHEL_LIKE) \
17
+
-DDISTRO_MAJ_VERSION=$(DISTRO_MAJ_VERSION) -DDISTRO_MIN_VERSION=$(DISTRO_MIN_VERSION) \
18
+
-DDISTRO_KERNEL_PKG_MAJ=$(DISTRO_KERNEL_PKG_MAJ) -DDISTRO_KERNEL_PKG_MIN=$(DISTRO_KERNEL_PKG_MIN) -DDISTRO_KERNEL_PKG_PNT=$(DISTRO_KERNEL_PKG_PNT)
19
+
-EXTRA_CFLAGS += -DAJALinux -DXENA2 $(DBG) -D$(NTV2TARGET) -D$(A_ARCH) $(EXTRA_DEPS) $(VERSIONING) $(DISTRO_INFO) $(INCLUDES) -Wall -Wno-implicit-fallthrough
20
+
+ccflags-y += -DAJALinux -DXENA2 $(DBG) -D$(NTV2TARGET) -D$(A_ARCH) $(EXTRA_DEPS) $(VERSIONING) $(DISTRO_INFO) $(INCLUDES) -Wall -Wno-implicit-fallthrough
21
+
22
+
ifdef AJA_HEVC
23
+
- EXTRA_CFLAGS += -DAJA_HEVC=$(AJA_HEVC)
24
+
+ ccflags-y += -DAJA_HEVC=$(AJA_HEVC)
25
+
endif
26
+
27
+
# if rdma is set
28
+
@@ -73,7 +73,7 @@ ifeq ($(NVIDIA_KO),)
29
+
endif
30
+
31
+
ifdef NVIDIA_IGPU
32
+
- EXTRA_CFLAGS += -DAJA_IGPU=1
33
+
+ ccflags-y += -DAJA_IGPU=1
34
+
ifneq ($(NVIDIA_KO),)
35
+
ifeq ($(NVIDIA_SYMVERS),)
36
+
NVIDIA_GEN_SYMVERS := ./nvidia-ko-to-module-symvers $(NVIDIA_KO) $(A_LINUX_DRIVER_PATH)/nvidia.symvers
37
+
@@ -91,17 +91,17 @@ endif
38
+
39
+
# determine if the ko is gpl - no ko is proprietary igpu
40
+
ifeq ($(NVIDIA_KO),)
41
+
- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1
42
+
+ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1
43
+
else
44
+
ifeq ($(shell modinfo $(NVIDIA_KO) | grep license: | grep GPL),)
45
+
- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1
46
+
+ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1 -DNVIDIA_PROPRIETARY=1
47
+
else
48
+
- EXTRA_CFLAGS += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1
49
+
+ ccflags-y += -I$(NVIDIA_SRC_DIR) -DAJA_RDMA=1
50
+
endif
51
+
endif
52
+
53
+
ifdef AJA_CREATE_DEVICE_NODES
54
+
- EXTRA_CFLAGS += -DAJA_CREATE_DEVICE_NODES=$(AJA_CREATE_DEVICE_NODES)
55
+
+ ccflags-y += -DAJA_CREATE_DEVICE_NODES=$(AJA_CREATE_DEVICE_NODES)
56
+
endif
57
+
58
+
AJANTV2INCS = $(A_LIB_NTV2_INC)/ajaexport.h \
59
+
--
60
+
2.49.0
61
+