From 1545480ecbd6e0bdffd85410d5a87783140507f1 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 18 Nov 2023 11:53:23 +0900 Subject: [PATCH] [debian] Clear out a large pile of bitrot This gets debian packages building again, though it was mainly a test for some improvements to configure and missing package reporting. --- bootstrap | 12 +++++----- debian/Makemodule.am | 3 +-- debian/changelog | 6 +++++ debian/control | 36 ++++------------------------ debian/quakeforge-common.install | 8 ++++++- debian/quakeforge-dev.install | 21 +++++++++++++++-- debian/quakeforge-jack.install | 2 +- debian/quakeforge-oss.install | 1 - debian/quakeforge-oss.postinst | 6 ----- debian/quakeforge-oss.prerm | 6 ----- debian/quakeforge-sdl.install | 4 ---- debian/quakeforge-sw32.install | 1 - debian/quakeforge-vulkan.install | 1 + debian/rules | 40 +++++++++++--------------------- debian/source/format | 2 +- 15 files changed, 61 insertions(+), 88 deletions(-) delete mode 100644 debian/quakeforge-oss.install delete mode 100644 debian/quakeforge-oss.postinst delete mode 100644 debian/quakeforge-oss.prerm delete mode 100644 debian/quakeforge-sdl.install delete mode 100644 debian/quakeforge-sw32.install create mode 100644 debian/quakeforge-vulkan.install diff --git a/bootstrap b/bootstrap index 902b8a69d..b9e80d0af 100755 --- a/bootstrap +++ b/bootstrap @@ -71,11 +71,11 @@ if test -n "$ac" ; then AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'` if test "$AC_VER_MAJOR" -lt "2" ; then - errors="Autoconf 2.69 or greater needed to build configure.\n$errors" + errors="Autoconf 2.71 or greater needed to build configure.\n$errors" fi - if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "69" ; then - errors="Autoconf 2.69 or greater needed to build configure.\n$errors" + if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "71" ; then + errors="Autoconf 2.71 or greater needed to build configure.\n$errors" fi fi else @@ -89,10 +89,10 @@ if test -n "$am" ; then AM_VER_MAJOR=`echo $AM_VER | cut -f1 -d.` AM_VER_MINOR=`echo $AM_VER | cut -f2 -d.` if test "$AM_VER_MAJOR" -lt "1"; then - errors="Automake 1.10 or greater needed to build makefiles.\n$errors" + errors="Automake 1.16 or greater needed to build makefiles.\n$errors" fi - if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "10"; then - errors="Automake 1.10 or greater needed to build makefiles.\n$errors" + if test "$AM_VER_MAJOR" -eq "1" -a "$AM_VER_MINOR" -lt "16"; then + errors="Automake 1.16 or greater needed to build makefiles.\n$errors" fi fi else diff --git a/debian/Makemodule.am b/debian/Makemodule.am index 9ef80d06a..c29648ba5 100644 --- a/debian/Makemodule.am +++ b/debian/Makemodule.am @@ -19,10 +19,9 @@ EXTRA_DIST += \ debian/quakeforge-oss.install \ debian/quakeforge-oss.postinst \ debian/quakeforge-oss.prerm \ - debian/quakeforge-sdl.install \ debian/quakeforge-servers.install \ debian/quakeforge-stub.postinst \ - debian/quakeforge-sw32.install \ + debian/quakeforge-vulkan.install \ debian/quakeforge-sw.install \ debian/quakeforge-utils.install \ debian/quakeforge-x11.install diff --git a/debian/changelog b/debian/changelog index cacf442ad..2f6bb08de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +quakeforge (0.9.0) frozen unstable; urgency=low + + * 4200+ changes + + -- Bill Currie Sat, 18 Nov 2023 00:12:45 +0900 + quakeforge (0.7.1-1) frozen unstable; urgency=low * version 0.7.1 :) diff --git a/debian/control b/debian/control index 0d3ddfa43..351ed1d66 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: contrib/games Priority: optional Maintainer: Jeff Teunissen Standards-Version: 3.1.1 -Build-Depends: automake (>= 1.8) | automake1.8, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libcurl-dev, libasound2-dev, libvorbis-dev, libflac-dev, libjack-dev, libpng12-dev, libsamplerate0-dev, libwildmidi-dev, git-core +Build-Depends: automake (>= 1.16), autoconf (>= 2.71), libtool, bison, flex, debhelper-compat (= 13), git-core, python3, libasound2-dev, libjack-jackd2-dev, libsamplerate0-dev, libflac-dev, libogg-dev, libvorbis-dev, libpng-dev, zlib1g-dev, libcurl4-openssl-dev, libncurses5-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libxi-dev, libxfixes-dev, libvulkan-dev, glslang-tools, libfontconfig-dev, libfreetype-dev, libharfbuzz-dev + Package: quakeforge Architecture: any @@ -53,22 +54,6 @@ Description: 3D first-person shooter engine - development files This package contains headers and static libraries for the development of utilities and applications for QuakeForge. -Package: quakeforge-sdl -Architecture: any -Conflicts: quake-sdl -Depends: quake-game, ${misc:Depends}, ${shlibs:Depends} -Provides: quakeforge-client -Suggests: joystick -Description: 3D first-person shooter engine - SDL client - QuakeForge is a source port of Quake and QuakeWorld, the successors to id - Software's very popular DOOM series. Its primary development goal is to - remain compatible with the original games released by id Software while - adding portability and optional extensions to enhance gameplay. - . - This package contains the SDL versions of the QuakeWorld client and - standalone engine, as well as CD audio and sound output plugins that use SDL to - do their work. - Package: quakeforge-x11 Architecture: any Conflicts: quake-x11 @@ -111,7 +96,7 @@ Description: 3D first-person shooter engine - Software renderer libraries This package contains the shared libraries needed to use the software renderer. -Package: quakeforge-sw32 +Package: quakeforge-vulkan Architecture: any Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} Section: contrib/libs @@ -121,8 +106,8 @@ Description: 3D first-person shooter engine - Software renderer libraries remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the shared libraries needed to use the 32bppi - software renderer. + This package contains the shared libraries needed to use the Vulkan + renderer. Package: quakeforge-gl Architecture: any @@ -150,17 +135,6 @@ Description: 3D first-person shooter engine - OpenGL renderer libraries This package contains the shared libraries needed to use the OpenGL GLSL renderer. -Package: quakeforge-oss -Architecture: any -Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} -Description: OSS digital audio output plugin for QuakeForge - The OSS plugin for QuakeForge provides digital audio output (using OSS/Linux, - OSS/Free, or kernel sound) for QuakeForge targets that contain clients. - . - NOTE: This plugin does not work on all systems, since it uses memory-mapped - I/O for the output device. If you have trouble, try the quakeforge-alsa - package. - Package: quakeforge-alsa Architecture: any Depends: quakeforge-common, ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/quakeforge-common.install b/debian/quakeforge-common.install index 21f0d176b..b5ce7ba19 100644 --- a/debian/quakeforge-common.install +++ b/debian/quakeforge-common.install @@ -1,12 +1,18 @@ etc/quakeforge.conf usr/lib/libQFcd.so.* usr/lib/libQFconsole.so.* +usr/lib/libQFecs.so.* usr/lib/libQFgib.so.* +usr/lib/libQFgib_client.so.* +usr/lib/libQFgui.so.* usr/lib/libQFimage.so.* -usr/lib/libQFjs.so.* +usr/lib/libQFinput.so.* usr/lib/libQFmodels.so.* usr/lib/libQFruamoko.so.* +usr/lib/libQFruamoko_client.so.* +usr/lib/libQFscene.so.* usr/lib/libQFsound.so.* +usr/lib/libQFui.so.* usr/lib/libQFutil.so.* usr/lib/quakeforge/plugins/cd_file.so* usr/lib/quakeforge/plugins/cd_linux.so* diff --git a/debian/quakeforge-dev.install b/debian/quakeforge-dev.install index e35307b27..270e83a44 100644 --- a/debian/quakeforge-dev.install +++ b/debian/quakeforge-dev.install @@ -2,22 +2,39 @@ usr/lib/libQFcd.*a usr/lib/libQFcd.so usr/lib/libQFconsole.*a usr/lib/libQFconsole.so +usr/lib/libQFecs.*a +usr/lib/libQFecs.so usr/lib/libQFgib.a usr/lib/libQFgib.so +usr/lib/libQFgib_client.a +usr/lib/libQFgib_client.so +usr/lib/libQFgui.a +usr/lib/libQFgui.so usr/lib/libQFimage.*a usr/lib/libQFimage.so -usr/lib/libQFjs.*a -usr/lib/libQFjs.so usr/lib/libQFmodels.*a usr/lib/libQFmodels.so usr/lib/libQFruamoko.*a usr/lib/libQFruamoko.so +usr/lib/libQFruamoko_client.a +usr/lib/libQFruamoko_client.so +usr/lib/libQFscene.*a +usr/lib/libQFscene.so usr/lib/libQFsound.*a usr/lib/libQFsound.so +usr/lib/libQFui.*a +usr/lib/libQFui.so usr/lib/libQFutil.*a usr/lib/libQFutil.so usr/lib/pkgconfig/quakeforge.pc usr/include/QF/GL/*.h +usr/include/QF/GLSL/*.h +usr/include/QF/Vulkan/*.h +usr/include/QF/input/*.h usr/include/QF/math/*.h usr/include/QF/plugin/*.h +usr/include/QF/progs/*.h* +usr/include/QF/scene/*.h +usr/include/QF/simd/*.h +usr/include/QF/ui/*.h usr/include/QF/*.h diff --git a/debian/quakeforge-jack.install b/debian/quakeforge-jack.install index ccd6ae4ed..ee45bfdf9 100644 --- a/debian/quakeforge-jack.install +++ b/debian/quakeforge-jack.install @@ -1 +1 @@ -usr/lib/quakeforge/plugins/snd_render_jack.so* +usr/lib/quakeforge/plugins/snd_output_jack.so* diff --git a/debian/quakeforge-oss.install b/debian/quakeforge-oss.install deleted file mode 100644 index c823dd95c..000000000 --- a/debian/quakeforge-oss.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/quakeforge/plugins/snd_output_oss.so* diff --git a/debian/quakeforge-oss.postinst b/debian/quakeforge-oss.postinst deleted file mode 100644 index d0348bc5d..000000000 --- a/debian/quakeforge-oss.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --install /usr/lib/quakeforge/plugins/snd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_oss.so 90 - -#DEBHELPER# -exit 0 diff --git a/debian/quakeforge-oss.prerm b/debian/quakeforge-oss.prerm deleted file mode 100644 index 5194144b1..000000000 --- a/debian/quakeforge-oss.prerm +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --remove quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_oss.so - -#DEBHELPER# -exit 0 diff --git a/debian/quakeforge-sdl.install b/debian/quakeforge-sdl.install deleted file mode 100644 index 107765745..000000000 --- a/debian/quakeforge-sdl.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/games/nq-sdl -usr/games/qw-client-sdl -usr/lib/quakeforge/plugins/cd_sdl.so* -usr/lib/quakeforge/plugins/snd_output_sdl.so* diff --git a/debian/quakeforge-sw32.install b/debian/quakeforge-sw32.install deleted file mode 100644 index acbaf09da..000000000 --- a/debian/quakeforge-sw32.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/quakeforge/plugins/vid_render_sw32.so* diff --git a/debian/quakeforge-vulkan.install b/debian/quakeforge-vulkan.install new file mode 100644 index 000000000..bacc4ad22 --- /dev/null +++ b/debian/quakeforge-vulkan.install @@ -0,0 +1 @@ +usr/lib/quakeforge/plugins/vid_render_vulkan.so* diff --git a/debian/rules b/debian/rules index 3caa15b80..55692b3ae 100755 --- a/debian/rules +++ b/debian/rules @@ -5,26 +5,24 @@ #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=7 +export DH_COMPAT=13 PACKAGE := quakeforge QFCC := qfcc common := $(PACKAGE)-common stub := $(PACKAGE)-stub maptools := $(PACKAGE)-maptools -dev := $(PACKAGE)-dev +dev := $(PACKAGE)-dev alsa := $(PACKAGE)-alsa gllib := $(PACKAGE)-gl glsllib := $(PACKAGE)-glsl -jack := $(PACKAGE)-jack -oss := $(PACKAGE)-oss -sdl := $(PACKAGE)-sdl -servers := $(PACKAGE)-servers swlib := $(PACKAGE)-sw -sw32lib := $(PACKAGE)-sw32 +vulkanlib := $(PACKAGE)-vulkan +jack := $(PACKAGE)-jack +servers := $(PACKAGE)-servers utils := $(PACKAGE)-utils -x11 := $(PACKAGE)-x11 +x11 := $(PACKAGE)-x11 build := $(shell pwd)/debian/tmp tmp := debian/tmp @@ -41,6 +39,7 @@ configure-stamp: # Add here commands to configure the package. ./bootstrap ./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \ + --enable-silent-rules \ --without-fbdev \ --with-ipv6 \ --disable-Werror \ @@ -49,7 +48,7 @@ configure-stamp: --infodir=/usr/share/info \ --with-sharepath=/usr/share/games/quake \ --with-plugin-path=/usr/lib/quakeforge/plugins \ - --with-clients=sdl,x11 \ + --with-clients=x11 \ --with-servers=master,nq,qw touch $@ @@ -57,13 +56,13 @@ configure-stamp: build: configure-stamp changelog-stamp build-stamp build-stamp: dh_testdir - $(MAKE) $(QFSMP) + $(MAKE) -j8 touch $@ changelog-stamp: dh_testdir # Add here commands to build the changelog - if test -d .git; then $(MAKE) changelog; fi + if test -d .git; then $(MAKE) changelog; else touch ChangeLog; fi touch $@ clean: @@ -142,21 +141,16 @@ install: build install -d -m755 debian/$(swlib)/usr/share/doc ln -s $(common) debian/$(swlib)/usr/share/doc/$(swlib) - # quakeforge-libs-sw32 - dh_install -p$(sw32lib) --sourcedir=$(tmp) - install -d -m755 debian/$(sw32lib)/usr/share/doc - ln -s $(common) debian/$(sw32lib)/usr/share/doc/$(sw32lib) + # quakeforge-libs-vulkan + dh_install -p$(vulkanlib) --sourcedir=$(tmp) + install -d -m755 debian/$(vulkanlib)/usr/share/doc + ln -s $(common) debian/$(vulkanlib)/usr/share/doc/$(vulkanlib) # quakeforge-servers dh_install -p$(servers) --sourcedir=$(tmp) install -d -m755 debian/$(servers)/usr/share/doc ln -s $(common) debian/$(servers)/usr/share/doc/$(servers) - # quakeforge-sdl - dh_install -p$(sdl) --sourcedir=$(tmp) - install -d -m755 debian/$(sdl)/usr/share/doc - ln -s $(common) debian/$(sdl)/usr/share/doc/$(sdl) - # quakeforge-x11 dh_install -p$(x11) --sourcedir=$(tmp) install -d -m755 debian/$(x11)/usr/share/doc @@ -167,11 +161,6 @@ install: build install -d -m755 debian/$(alsa)/usr/share/doc ln -s $(common) debian/$(alsa)/usr/share/doc/$(alsa) - # quakeforge-oss - dh_install -p$(oss) --sourcedir=$(tmp) - install -d -m755 debian/$(oss)/usr/share/doc - ln -s $(common) debian/$(oss)/usr/share/doc/$(oss) - # quakeforge-jack dh_install -p$(jack) --sourcedir=$(tmp) install -d -m755 debian/$(jack)/usr/share/doc @@ -215,7 +204,6 @@ binary-arch: build install dh_installman -p$(QFCC) dh_installman -p$(maptools) dh_installman -p$(utils) - dh_undocumented dh_strip -Xshare/qfcc dh_link dh_compress diff --git a/debian/source/format b/debian/source/format index d3827e75a..89ae9db8f 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (native)