snd-pcxhr: split package up into dkms source and firmwareHEADmaster

48 files changed, 44 insertions, 39 deletions

diff --git a/snd-pcxhr-dkms/debian/changelog b/snd-pcxhr-dkms/debian/changelog
deleted file mode 100644
index 625424f..0000000
--- a/snd-pcxhr-dkms/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-snd-pcxhr-dkms (2.0.13-1) unstable; urgency=medium
-
-  * import base version from https://github.com/Digigram-audio/pcxhr
-  * add patches to fix build for bookworm
-
- -- Christian Pointner <equinox@spreadspace.org>  Thu, 27 Mar 2025 20:24:47 +0100
diff --git a/snd-pcxhr-dkms/debian/rules b/snd-pcxhr-dkms/debian/rules
deleted file mode 100755
index 19cc092..0000000
--- a/snd-pcxhr-dkms/debian/rules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/pkg-info.mk
-
-%:
-	dh $@ --with dkms
-
-override_dh_install:
-	dh_install src/* usr/src/snd-pcxhr-$(DEB_VERSION_UPSTREAM)/
-
-override_dh_dkms:
-	dh_dkms -V $(DEB_VERSION_UPSTREAM) -- src/dkms.conf
-
-override_dh_auto_configure:
-override_dh_auto_build:
-override_dh_auto_test:
-override_dh_auto_install:
-override_dh_auto_clean:
diff --git a/snd-pcxhr/debian/changelog b/snd-pcxhr/debian/changelog
new file mode 100644
index 0000000..f5a948c
--- /dev/null
+++ b/snd-pcxhr/debian/changelog
@@ -0,0 +1,12 @@
+snd-pcxhr (2.0.13-2) unstable; urgency=medium
+
+  * split package into dkms and firmware
+
+ -- Christian Pointner <equinox@spreadspace.org>  Thu, 08 May 2025 19:08:47 +0200
+
+snd-pcxhr (2.0.13-1) unstable; urgency=medium
+
+  * import base version from https://github.com/Digigram-audio/pcxhr
+  * add patches to fix build for bookworm
+
+ -- Christian Pointner <equinox@spreadspace.org>  Thu, 27 Mar 2025 20:24:47 +0100
diff --git a/snd-pcxhr-dkms/debian/control b/snd-pcxhr/debian/control
index 238914e..9092ce3 100644
--- a/snd-pcxhr-dkms/debian/control
+++ b/snd-pcxhr/debian/control
@@ -1,4 +1,4 @@
-Source: snd-pcxhr-dkms
+Source: snd-pcxhr
 Section: kernel
 Priority: optional
 Maintainer: Christian Pointner <equinox@spreadspace.org>
@@ -9,5 +9,10 @@ Rules-Requires-Root: no
 
 Package: snd-pcxhr-dkms
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: snd-pcxhr-firmware, ${misc:Depends}
 Description: ALSA Driver for Digigram VX/PCX cards
+
+Package: snd-pcxhr-firmware
+Architecture: all
+Depends: ${misc:Depends}
+Description: Firmware files for Digigram VX/PCX soundcards
diff --git a/snd-pcxhr/debian/rules b/snd-pcxhr/debian/rules
new file mode 100755
index 0000000..69bc5cc
--- /dev/null
+++ b/snd-pcxhr/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+%:
+	dh $@ --with dkms
+
+override_dh_auto_install:
+	install -d $$(pwd)/debian/tmp/usr/src/snd-pcxhr-$(DEB_VERSION_UPSTREAM)/
+	install $$(pwd)/src/Makefile $$(pwd)/src/*.c $$(pwd)/src/*.h $$(pwd)/debian/tmp/usr/src/snd-pcxhr-$(DEB_VERSION_UPSTREAM)/
+	install -d $$(pwd)/debian/tmp/lib/firmware/pcxhr/
+	install $$(pwd)/src/firmware/* $$(pwd)/debian/tmp/lib/firmware/pcxhr/
+
+override_dh_auto_configure:
+override_dh_auto_build:
+override_dh_auto_test:
+override_dh_auto_install:
+override_dh_auto_clean:
diff --git a/snd-pcxhr/debian/snd-pcxhr-dkms.dkms b/snd-pcxhr/debian/snd-pcxhr-dkms.dkms
new file mode 120000
index 0000000..8366489
--- /dev/null
+++ b/snd-pcxhr/debian/snd-pcxhr-dkms.dkms
@@ -0,0 +1 @@
+../src/dkms.conf
\ No newline at end of file
diff --git a/snd-pcxhr/debian/snd-pcxhr-dkms.install b/snd-pcxhr/debian/snd-pcxhr-dkms.install
new file mode 100644
index 0000000..b601f22
--- /dev/null
+++ b/snd-pcxhr/debian/snd-pcxhr-dkms.install
@@ -0,0 +1 @@
+usr/src
diff --git a/snd-pcxhr/debian/snd-pcxhr-firmware.install b/snd-pcxhr/debian/snd-pcxhr-firmware.install
new file mode 100644
index 0000000..89d87aa
--- /dev/null
+++ b/snd-pcxhr/debian/snd-pcxhr-firmware.install
@@ -0,0 +1 @@
+lib/firmware/pcxhr/
diff --git a/snd-pcxhr-dkms/debian/source/format b/snd-pcxhr/debian/source/format
index d3827e7..d3827e7 100644
--- a/snd-pcxhr-dkms/debian/source/format
+++ b/snd-pcxhr/debian/source/format
diff --git a/snd-pcxhr-dkms/src/Makefile b/snd-pcxhr/src/Makefile
index 4d0bcf8..d68eb62 100644
--- a/snd-pcxhr-dkms/src/Makefile
+++ b/snd-pcxhr/src/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-pcxhr-y := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o pcxhr_hrtimer.o
-# pcxhr_clock_monitoring.o 
+# pcxhr_clock_monitoring.o
 obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o
 
 # KVERSION is the kernel version
@@ -27,24 +27,15 @@ MODULES_DIR := /lib/modules/$(shell uname -r)/digigram
 default:
 	$(MAKE) -C $(KDIR) M=$(PWD) modules
 
-all: clean default install-firmwares
+all: clean default
 
 clean:
 	$(MAKE) -C $(KDIR) M=$(PWD) clean
-	
-install-firmwares:
-	test ! -d /lib/firmware/pcxhr/firmware || rm -Rf /lib/firmware/pcxhr/firmware
-	test -d /lib/firmware/pcxhr || mkdir /lib/firmware/pcxhr/
-	cp -Rf ./firmware/* /lib/firmware/pcxhr/
-
-update-firmware:
-	test ! -d /lib/firmware/pcxhr || mkdir /lib/firmware/pcxhr/
-	cp ./firmware/dspe924e5.e56 /lib/firmware/pcxhr/
 
 install:
 	test -d $(MODULES_DIR) || mkdir $(MODULES_DIR)
 	cp *.ko /lib/modules/$(shell uname -r)/digigram
 	depmod -ae
 
-	
-.PHONY: default all clean install-firmwares update-firmware install
+
+.PHONY: default all clean install
diff --git a/snd-pcxhr-dkms/src/dkms.conf b/snd-pcxhr/src/dkms.conf
index e43bdfb..e43bdfb 100644
--- a/snd-pcxhr-dkms/src/dkms.conf
+++ b/snd-pcxhr/src/dkms.conf
diff --git a/snd-pcxhr-dkms/src/firmware/b321_512.b56 b/snd-pcxhr/src/firmware/b321_512.b56
index 3e82688..3e82688 100644
--- a/snd-pcxhr-dkms/src/firmware/b321_512.b56
+++ b/snd-pcxhr/src/firmware/b321_512.b56
diff --git a/snd-pcxhr-dkms/src/firmware/d321_512.d56 b/snd-pcxhr/src/firmware/d321_512.d56
index 9531b2c..9531b2c 100644
--- a/snd-pcxhr-dkms/src/firmware/d321_512.d56
+++ b/snd-pcxhr/src/firmware/d321_512.d56
diff --git a/snd-pcxhr-dkms/src/firmware/dspb1222e.b56 b/snd-pcxhr/src/firmware/dspb1222e.b56
index 8ec982e..8ec982e 100644
--- a/snd-pcxhr-dkms/src/firmware/dspb1222e.b56
+++ b/snd-pcxhr/src/firmware/dspb1222e.b56
diff --git a/snd-pcxhr-dkms/src/firmware/dspb1222hr.b56 b/snd-pcxhr/src/firmware/dspb1222hr.b56
index 068390a..068390a 100644
--- a/snd-pcxhr-dkms/src/firmware/dspb1222hr.b56
+++ b/snd-pcxhr/src/firmware/dspb1222hr.b56
diff --git a/snd-pcxhr-dkms/src/firmware/dspb882e.b56 b/snd-pcxhr/src/firmware/dspb882e.b56
index 39e6621..39e6621 100644
--- a/snd-pcxhr-dkms/src/firmware/dspb882e.b56
+++ b/snd-pcxhr/src/firmware/dspb882e.b56
diff --git a/snd-pcxhr-dkms/src/firmware/dspb882hr.b56 b/snd-pcxhr/src/firmware/dspb882hr.b56
index edcac1e..edcac1e 100644
--- a/snd-pcxhr-dkms/src/firmware/dspb882hr.b56
+++ b/snd-pcxhr/src/firmware/dspb882hr.b56
diff --git a/snd-pcxhr-dkms/src/firmware/dspb924.b56 b/snd-pcxhr/src/firmware/dspb924.b56
index 1c5b415..1c5b415 100644
--- a/snd-pcxhr-dkms/src/firmware/dspb924.b56
+++ b/snd-pcxhr/src/firmware/dspb924.b56
diff --git a/snd-pcxhr-dkms/src/firmware/dspd1222.d56 b/snd-pcxhr/src/firmware/dspd1222.d56
index 66f8e83..66f8e83 100644
--- a/snd-pcxhr-dkms/src/firmware/dspd1222.d56
+++ b/snd-pcxhr/src/firmware/dspd1222.d56
diff --git a/snd-pcxhr-dkms/src/firmware/dspd222.d56 b/snd-pcxhr/src/firmware/dspd222.d56
index 27b3a9a..27b3a9a 100644
--- a/snd-pcxhr-dkms/src/firmware/dspd222.d56
+++ b/snd-pcxhr/src/firmware/dspd222.d56
diff --git a/snd-pcxhr-dkms/src/firmware/dspd882.d56 b/snd-pcxhr/src/firmware/dspd882.d56
index 6d46f0f..6d46f0f 100644
--- a/snd-pcxhr-dkms/src/firmware/dspd882.d56
+++ b/snd-pcxhr/src/firmware/dspd882.d56
diff --git a/snd-pcxhr-dkms/src/firmware/dspe882.e56 b/snd-pcxhr/src/firmware/dspe882.e56
index 6289320..6289320 100644
--- a/snd-pcxhr-dkms/src/firmware/dspe882.e56
+++ b/snd-pcxhr/src/firmware/dspe882.e56
diff --git a/snd-pcxhr-dkms/src/firmware/dspe924.e56 b/snd-pcxhr/src/firmware/dspe924.e56
index 1448af7..1448af7 100644
--- a/snd-pcxhr-dkms/src/firmware/dspe924.e56
+++ b/snd-pcxhr/src/firmware/dspe924.e56
diff --git a/snd-pcxhr-dkms/src/firmware/dspe924e5.e56 b/snd-pcxhr/src/firmware/dspe924e5.e56
index 6858cf5..6858cf5 100644
--- a/snd-pcxhr-dkms/src/firmware/dspe924e5.e56
+++ b/snd-pcxhr/src/firmware/dspe924e5.e56
diff --git a/snd-pcxhr-dkms/src/firmware/e321_512.e56 b/snd-pcxhr/src/firmware/e321_512.e56
index 5a13498..5a13498 100644
--- a/snd-pcxhr-dkms/src/firmware/e321_512.e56
+++ b/snd-pcxhr/src/firmware/e321_512.e56
diff --git a/snd-pcxhr-dkms/src/firmware/xc_1_882.dat b/snd-pcxhr/src/firmware/xc_1_882.dat
index 5ed6cd7..5ed6cd7 100644
--- a/snd-pcxhr-dkms/src/firmware/xc_1_882.dat
+++ b/snd-pcxhr/src/firmware/xc_1_882.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xi_1_882.dat b/snd-pcxhr/src/firmware/xi_1_882.dat
index 6329571..6329571 100644
--- a/snd-pcxhr-dkms/src/firmware/xi_1_882.dat
+++ b/snd-pcxhr/src/firmware/xi_1_882.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc1222e.dat b/snd-pcxhr/src/firmware/xlxc1222e.dat
index f6aac85..f6aac85 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc1222e.dat
+++ b/snd-pcxhr/src/firmware/xlxc1222e.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc1222hr.dat b/snd-pcxhr/src/firmware/xlxc1222hr.dat
index 21dabde..21dabde 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc1222hr.dat
+++ b/snd-pcxhr/src/firmware/xlxc1222hr.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc222.dat b/snd-pcxhr/src/firmware/xlxc222.dat
index f93a792..f93a792 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc222.dat
+++ b/snd-pcxhr/src/firmware/xlxc222.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc882e.dat b/snd-pcxhr/src/firmware/xlxc882e.dat
index 8f88656..8f88656 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc882e.dat
+++ b/snd-pcxhr/src/firmware/xlxc882e.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc882hr.dat b/snd-pcxhr/src/firmware/xlxc882hr.dat
index d59dfe0..d59dfe0 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc882hr.dat
+++ b/snd-pcxhr/src/firmware/xlxc882hr.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxc924.dat b/snd-pcxhr/src/firmware/xlxc924.dat
index ba3fc2f..ba3fc2f 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxc924.dat
+++ b/snd-pcxhr/src/firmware/xlxc924.dat
diff --git a/snd-pcxhr-dkms/src/firmware/xlxint.dat b/snd-pcxhr/src/firmware/xlxint.dat
index d57d0cd..d57d0cd 100644
--- a/snd-pcxhr-dkms/src/firmware/xlxint.dat
+++ b/snd-pcxhr/src/firmware/xlxint.dat
diff --git a/snd-pcxhr-dkms/src/pcxhr.c b/snd-pcxhr/src/pcxhr.c
index 0793e69..0793e69 100644
--- a/snd-pcxhr-dkms/src/pcxhr.c
+++ b/snd-pcxhr/src/pcxhr.c
diff --git a/snd-pcxhr-dkms/src/pcxhr.h b/snd-pcxhr/src/pcxhr.h
index bd7c40d..bd7c40d 100644
--- a/snd-pcxhr-dkms/src/pcxhr.h
+++ b/snd-pcxhr/src/pcxhr.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_clock_monitoring.c b/snd-pcxhr/src/pcxhr_clock_monitoring.c
index 74043c0..74043c0 100644
--- a/snd-pcxhr-dkms/src/pcxhr_clock_monitoring.c
+++ b/snd-pcxhr/src/pcxhr_clock_monitoring.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_clock_monitoring.h b/snd-pcxhr/src/pcxhr_clock_monitoring.h
index 9825f9d..9825f9d 100644
--- a/snd-pcxhr-dkms/src/pcxhr_clock_monitoring.h
+++ b/snd-pcxhr/src/pcxhr_clock_monitoring.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_core.c b/snd-pcxhr/src/pcxhr_core.c
index 020088b..020088b 100644
--- a/snd-pcxhr-dkms/src/pcxhr_core.c
+++ b/snd-pcxhr/src/pcxhr_core.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_core.h b/snd-pcxhr/src/pcxhr_core.h
index c0ec553..c0ec553 100644
--- a/snd-pcxhr-dkms/src/pcxhr_core.h
+++ b/snd-pcxhr/src/pcxhr_core.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_hrtimer.c b/snd-pcxhr/src/pcxhr_hrtimer.c
index 4ccc1bf..4ccc1bf 100644
--- a/snd-pcxhr-dkms/src/pcxhr_hrtimer.c
+++ b/snd-pcxhr/src/pcxhr_hrtimer.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_hrtimer.h b/snd-pcxhr/src/pcxhr_hrtimer.h
index b54d864..b54d864 100644
--- a/snd-pcxhr-dkms/src/pcxhr_hrtimer.h
+++ b/snd-pcxhr/src/pcxhr_hrtimer.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_hwdep.c b/snd-pcxhr/src/pcxhr_hwdep.c
index da67207..da67207 100644
--- a/snd-pcxhr-dkms/src/pcxhr_hwdep.c
+++ b/snd-pcxhr/src/pcxhr_hwdep.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_hwdep.h b/snd-pcxhr/src/pcxhr_hwdep.h
index f7a440e..f7a440e 100644
--- a/snd-pcxhr-dkms/src/pcxhr_hwdep.h
+++ b/snd-pcxhr/src/pcxhr_hwdep.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_mix22.c b/snd-pcxhr/src/pcxhr_mix22.c
index 57972ff..57972ff 100644
--- a/snd-pcxhr-dkms/src/pcxhr_mix22.c
+++ b/snd-pcxhr/src/pcxhr_mix22.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_mix22.h b/snd-pcxhr/src/pcxhr_mix22.h
index b1e4ffc..b1e4ffc 100644
--- a/snd-pcxhr-dkms/src/pcxhr_mix22.h
+++ b/snd-pcxhr/src/pcxhr_mix22.h
diff --git a/snd-pcxhr-dkms/src/pcxhr_mixer.c b/snd-pcxhr/src/pcxhr_mixer.c
index aec5094..aec5094 100644
--- a/snd-pcxhr-dkms/src/pcxhr_mixer.c
+++ b/snd-pcxhr/src/pcxhr_mixer.c
diff --git a/snd-pcxhr-dkms/src/pcxhr_mixer.h b/snd-pcxhr/src/pcxhr_mixer.h
index 9c08620..9c08620 100644
--- a/snd-pcxhr-dkms/src/pcxhr_mixer.h
+++ b/snd-pcxhr/src/pcxhr_mixer.h