diff --git a/sources/.gitignore b/sources/.gitignore index d28a741..1e6f8f8 100644 --- a/sources/.gitignore +++ b/sources/.gitignore @@ -8,7 +8,6 @@ *.upload files -include-binaries /libs/*/* !/libs/*/debian @@ -38,6 +37,7 @@ include-binaries /apps/*/debian/* !/apps/*/debian/patches /apps/*/debian/patches/* +!/apps/*/debian/binaries !/apps/*/debian/patches/*.patch !/apps/*/debian/patches/series !/apps/*/debian/source diff --git a/sources/apps/wineasio/debian/binaries/README b/sources/apps/wineasio/debian/binaries/README new file mode 100644 index 0000000..41f083b --- /dev/null +++ b/sources/apps/wineasio/debian/binaries/README @@ -0,0 +1,6 @@ +Storing the final binaries here, which is needed due to launchpad not allowing: + - installing i386 packages on x86_64 builders + - generating i386 packages from a PPA + +Either of those would allow wineasio packaging, but both are not possible and thus we build it outside of PPAs. +Builds are created within a container to help reproducibility, see https://github.com/wineasio/wineasio/tree/master/docker diff --git a/sources/apps/wineasio/debian/binaries/wineasio32.dll b/sources/apps/wineasio/debian/binaries/wineasio32.dll new file mode 100644 index 0000000..583c697 Binary files /dev/null and b/sources/apps/wineasio/debian/binaries/wineasio32.dll differ diff --git a/sources/apps/wineasio/debian/binaries/wineasio32.dll.so2 b/sources/apps/wineasio/debian/binaries/wineasio32.dll.so2 new file mode 100755 index 0000000..1532681 Binary files /dev/null and b/sources/apps/wineasio/debian/binaries/wineasio32.dll.so2 differ diff --git a/sources/apps/wineasio/debian/binaries/wineasio64.dll b/sources/apps/wineasio/debian/binaries/wineasio64.dll new file mode 100644 index 0000000..1dabe41 Binary files /dev/null and b/sources/apps/wineasio/debian/binaries/wineasio64.dll differ diff --git a/sources/apps/wineasio/debian/binaries/wineasio64.dll.so2 b/sources/apps/wineasio/debian/binaries/wineasio64.dll.so2 new file mode 100755 index 0000000..6b6b4bc Binary files /dev/null and b/sources/apps/wineasio/debian/binaries/wineasio64.dll.so2 differ diff --git a/sources/apps/wineasio/debian/changelog b/sources/apps/wineasio/debian/changelog index 60f6eda..7f00ac7 100644 --- a/sources/apps/wineasio/debian/changelog +++ b/sources/apps/wineasio/debian/changelog @@ -1,4 +1,4 @@ -wineasio (5:1.2.0b-1kxstudio6) focal; urgency=medium +wineasio (5:1.2.0b-4kxstudio1) focal; urgency=medium * Fix compat with legacy wine diff --git a/sources/apps/wineasio/debian/control b/sources/apps/wineasio/debian/control index ebb4383..d3e8d73 100644 --- a/sources/apps/wineasio/debian/control +++ b/sources/apps/wineasio/debian/control @@ -14,8 +14,7 @@ XSC-KXStudio-VCS: https://github.com/wineasio/wineasio/ Package: wineasio Architecture: i386 amd64 -Depends: ${misc:Depends}, wineasio-i386 [i386], wineasio-amd64 [amd64], wineasio-data -Recommends: wineasio-i386 [amd64] +Depends: ${misc:Depends}, wineasio-i386 [i386 amd64], wineasio-amd64 [amd64], wineasio-data Description: ASIO to JACK driver for WINE WineASIO is a ASIO driver for Wine, allowing to run Windows audio applications with @@ -32,9 +31,9 @@ Description: ASIO to JACK driver for WINE This package provides the shared data used for the settings tool Package: wineasio-i386 -Architecture: i386 +Architecture: i386 amd64 Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, libjack-jackd2-0 | libjack0 | pipewire-jack Description: ASIO to JACK driver for WINE (32bit) WineASIO is a ASIO driver for Wine, allowing to run Windows audio applications with @@ -45,7 +44,7 @@ Description: ASIO to JACK driver for WINE (32bit) Package: wineasio-amd64 Architecture: amd64 Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, libjack-jackd2-0 | libjack0 | pipewire-jack Description: ASIO to JACK driver for WINE (64bit) WineASIO is a ASIO driver for Wine, allowing to run Windows audio applications with diff --git a/sources/apps/wineasio/debian/patches/01_fix-compat.patch b/sources/apps/wineasio/debian/patches/01_fix-compat.patch deleted file mode 100644 index 3798357..0000000 --- a/sources/apps/wineasio/debian/patches/01_fix-compat.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit bde84a3b8d02112607cfa33f72b51e39b38790a8 -Author: falkTX -Date: Thu Feb 29 00:03:08 2024 +0100 - - Fix compat with newer wine that does not have winelib - - Signed-off-by: falkTX - -diff --git a/Makefile.mk b/Makefile.mk -index 991fd5d..67ffafa 100644 ---- a/Makefile.mk -+++ b/Makefile.mk -@@ -75,6 +75,7 @@ wineasio_dll_LDFLAGS = -shared \ - -L/opt/wine-staging/lib/wine \ - -L/opt/wine-staging/lib$(M) \ - -L/opt/wine-staging/lib$(M)/wine -+wineasio_dll_LDFLAGS += -nostartfiles - wineasio_dll_DLLS = odbc32 \ - ole32 \ - winmm diff --git a/sources/apps/wineasio/debian/patches/series b/sources/apps/wineasio/debian/patches/series deleted file mode 100644 index 8394a7b..0000000 --- a/sources/apps/wineasio/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_fix-compat.patch diff --git a/sources/apps/wineasio/debian/rules b/sources/apps/wineasio/debian/rules index 9b28566..ee97676 100755 --- a/sources/apps/wineasio/debian/rules +++ b/sources/apps/wineasio/debian/rules @@ -8,23 +8,27 @@ CFLAGS += -fno-lto dh $@ override_dh_auto_build: -ifeq ($(DEB_BUILD_ARCH),amd64) - $(MAKE) WINEBUILD=winebuild-development WINECC=winegcc-development 64 -endif -ifeq ($(DEB_BUILD_ARCH),i386) - $(MAKE) WINEBUILD=winebuild-development WINECC=winegcc-development 32 -endif + install -d build32 + install -d build64 + install -m 644 debian/binaries/wineasio32.dll build32/wineasio32.dll + install -m 644 debian/binaries/wineasio64.dll build64/wineasio64.dll + install -m 644 debian/binaries/wineasio32.dll.so2 build32/wineasio32.dll.so + install -m 644 debian/binaries/wineasio64.dll.so2 build64/wineasio64.dll.so +# ifeq ($(DEB_BUILD_ARCH),i386) +# $(MAKE) WINEBUILD=winebuild-development WINECC=winegcc-development 32 +# else ifeq ($(DEB_BUILD_ARCH),amd64) +# $(MAKE) WINEBUILD=winebuild-development WINECC=winegcc-development 64 +# endif override_dh_auto_install: $(MAKE) -C gui install DESTDIR=$(CURDIR)/debian/tmp install -m 755 wineasio-register $(CURDIR)/debian/tmp/usr/bin/ override_dh_shlibdeps: -ifeq ($(DEB_BUILD_ARCH),amd64) - env LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/wine-development dh_shlibdeps - sed -i "s/, libwine-development//" debian/wineasio-amd64.substvars -endif -ifeq ($(DEB_BUILD_ARCH),i386) - env LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/i386-linux-gnu/wine-development dh_shlibdeps - sed -i "s/, libwine-development//" debian/wineasio-i386.substvars -endif +# ifeq ($(DEB_BUILD_ARCH),i386) +# env LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/i386-linux-gnu/wine-development dh_shlibdeps +# sed -i "s/, libwine-development//" debian/wineasio-i386.substvars +# else ifeq ($(DEB_BUILD_ARCH),amd64) +# env LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/wine-development dh_shlibdeps +# sed -i "s/, libwine-development//" debian/wineasio-amd64.substvars +# endif diff --git a/sources/apps/wineasio/debian/source/include-binaries b/sources/apps/wineasio/debian/source/include-binaries new file mode 100644 index 0000000..f44e131 --- /dev/null +++ b/sources/apps/wineasio/debian/source/include-binaries @@ -0,0 +1,4 @@ +debian/binaries/wineasio32.dll +debian/binaries/wineasio32.dll.so2 +debian/binaries/wineasio64.dll +debian/binaries/wineasio64.dll.so2 diff --git a/sources/apps/wineasio/debian/wineasio-amd64.links b/sources/apps/wineasio/debian/wineasio-amd64.links index 746eeff..2195af7 100644 --- a/sources/apps/wineasio/debian/wineasio-amd64.links +++ b/sources/apps/wineasio/debian/wineasio-amd64.links @@ -1,8 +1,11 @@ /usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /usr/lib/x86_64-linux-gnu/wine/wineasio64.dll.so /usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /usr/lib/x86_64-linux-gnu/wine-development/wineasio64.dll.so /usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-devel/lib64/wine/x86_64-unix/wineasio64.dll.so +/usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-devel/lib64/wine/x86_64-unix/wineasio64.so /usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-stable/lib64/wine/x86_64-unix/wineasio64.dll.so +/usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-stable/lib64/wine/x86_64-unix/wineasio64.so /usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-staging/lib64/wine/x86_64-unix/wineasio64.dll.so +/usr/lib/x86_64-linux-gnu/wine/x86_64-unix/wineasio64.dll.so /opt/wine-staging/lib64/wine/x86_64-unix/wineasio64.so /usr/lib/x86_64-linux-gnu/wine/x86_64-windows/wineasio64.dll /usr/lib/x86_64-linux-gnu/wine/wineasio64.dll /usr/lib/x86_64-linux-gnu/wine/x86_64-windows/wineasio64.dll /usr/lib/x86_64-linux-gnu/wine-development/wineasio64.dll diff --git a/sources/apps/wineasio/debian/wineasio-i386.links b/sources/apps/wineasio/debian/wineasio-i386.links index b7ae8b7..1e5568b 100644 --- a/sources/apps/wineasio/debian/wineasio-i386.links +++ b/sources/apps/wineasio/debian/wineasio-i386.links @@ -1,8 +1,11 @@ /usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /usr/lib/i386-linux-gnu/wine/wineasio32.dll.so /usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /usr/lib/i386-linux-gnu/wine-development/wineasio32.dll.so /usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-devel/lib/wine/i386-unix/wineasio32.dll.so +/usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-devel/lib/wine/i386-unix/wineasio32.so /usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-stable/lib/wine/i386-unix/wineasio32.dll.so +/usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-stable/lib/wine/i386-unix/wineasio32.so /usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-staging/lib/wine/i386-unix/wineasio32.dll.so +/usr/lib/i386-linux-gnu/wine/i386-unix/wineasio32.dll.so /opt/wine-staging/lib/wine/i386-unix/wineasio32.so /usr/lib/i386-linux-gnu/wine/i386-windows/wineasio32.dll /usr/lib/i386-linux-gnu/wine/wineasio32.dll /usr/lib/i386-linux-gnu/wine/i386-windows/wineasio32.dll /usr/lib/i386-linux-gnu/wine-development/wineasio32.dll