Switch from Autoconf to plain Make

GNU Autoconf is too complicated! Spek is a small program, so classic
Make will suffice. Now everything is in a short Makefile (<= 300 LOC),
which should be POSIX too.

.gitignore

@@ -7,20 +7,8 @@
 *.zip
 *~
 .DS_Store
-.deps
-ABOUT-NLS
-Makefile
-Makefile.in
-Makefile.in.in
-aclocal.m4
-autom4te.cache
-ar-lib
-compile
-config.*
-configure
 data/spek.desktop
 data/spek.metainfo.xml
-depcomp
 dist/osx/Info.plist
 dist/osx/Spek.app
 dist/osx/Spek.dmg
@@ -28,27 +16,14 @@ dist/win/Spek
 dist/win/spek.wxs
 dist/win/tests
 env
-install-sh
-libtool
-ltmain.sh
 m4/
 man/spek.1
 missing
 mkinstalldirs
-omf.make
-po/*.header
 po/*.gmo
-po/*.sed
-po/*.sin
-po/*.template
-po/POTFILES
-po/Rules-quot
-po/stamp-it
-po/stamp-po
+spek
 src/*.stamp
 src/.libs
-src/spek
-stamp-h1
 tests/.libs
 tests/perf
 tests/samples/perf.wav

Makefile

@@ -0,0 +1,232 @@
+NAME    = spek
+BIN     = ${NAME}${EXT}
+LIB     = lib${NAME}.a
+VERSION = 0.8.5
+
+PREFIX = /usr/local
+
+LIBS = -lavcodec -lavformat -lavutil `wx-config --libs`
+
+TESTS_LIBS = -lavcodec -lavformat -lavutil
+
+TESTS_CPPFLAGS = -DSAMPLES_DIR=\"samples\" -Isrc -pthread ${CPPFLAGS}
+TESTS_CXXFLAGS = -Os ${TESTS_CPPFLAGS} ${CXXFLAGS}
+TESTS_LDFLAGS  = -pthread ${TESTS_LIBS} ${LDFLAGS}
+
+SPEK_CPPFLAGS = ${OS_FLAGS} -DGETTEXT_PACKAGE=\"'${NAME}'\" -DPACKAGE_NAME=\"'${NAME}'\" -DPACKAGE_VERSION=\"'${VERSION}'\" `wx-config --cppflags` ${CPPFLAGS}
+SPEK_CXXFLAGS = -Os `wx-config --cxxflags` ${SPEK_CPPFLAGS} ${CXXFLAGS}
+SPEK_LDFLAGS  = ${LIBS} ${LDFLAGS}
+
+GMO = ${PO:.po=.gmo}
+
+OBJ_LIB = \
+	src/spek-audio.o \
+	src/spek-fft.o \
+	src/spek-palette.o \
+	src/spek-pipeline.o \
+	src/spek-utils.o \
+
+OBJ_PERF = \
+	tests/perf.o \
+
+OBJ_TEST = \
+	tests/test-audio.o \
+	tests/test-fft.o \
+	tests/test-utils.o \
+	tests/test.o \
+
+OBJ = \
+	src/spek-artwork.o \
+	src/spek-events.o \
+	src/spek.o \
+	src/spek-platform.o \
+	src/spek-preferences-dialog.o \
+	src/spek-preferences.o \
+	src/spek-ruler.o \
+	src/spek-spectrogram.o \
+	src/spek-window.o \
+
+PO = \
+	po/bs.po \
+	po/ca.po \
+	po/cs.po \
+	po/da.po \
+	po/de.po \
+	po/el.po \
+	po/eo.po \
+	po/es.po \
+	po/fi.po \
+	po/fr.po \
+	po/gl.po \
+	po/he.po \
+	po/hr.po \
+	po/hu.po \
+	po/id.po \
+	po/it.po \
+	po/ja.po \
+	po/ko.po \
+	po/lv.po \
+	po/nb.po \
+	po/nl.po \
+	po/nn.po \
+	po/pl.po \
+	po/pt_BR.po \
+	po/ru.po \
+	po/sk.po \
+	po/sr@latin.po \
+	po/sv.po \
+	po/th.po \
+	po/tr.po \
+	po/uk.po \
+	po/vi.po \
+	po/zh_CN.po \
+	po/zh_TW.po \
+
+POTFILES = \
+	data/spek.desktop.in \
+	src/spek-pipeline.cc \
+	src/spek-preferences-dialog.cc \
+	src/spek-spectrogram.cc \
+	src/spek-window.cc \
+	src/spek.cc \
+
+all:
+	@echo "To build ${NAME} type make and one the following: osx, unix or win."
+	@echo "E.g. \`make unix\`"
+
+options:
+	@echo "${NAME} build options:"
+	@echo "CXXFLAGS = ${SPEK_CXXFLAGS}"
+	@echo "LDFLAGS  = ${SPEK_LDFLAGS}"
+	@echo "CXX      = ${CXX}"
+
+.cc.o:
+	${CXX} -c ${SPEK_CXXFLAGS} $< -o $@
+
+.po.gmo:
+	msgfmt -o $@ $<
+
+${LIB}: ${OBJ_LIB}
+	ar crs $@ ${OBJ_LIB}
+
+${BIN}: ${LIB} ${OBJ}
+	${CXX} -o ${BIN} ${OBJ} ${LIB} ${SPEK_LDFLAGS}
+
+data/${NAME}.desktop: po/LINGUAS
+	sed '/^#/d' ${@}.in > ${@}.in.tmp
+	msgfmt -d po -o $@ --desktop --template=${@}.in.tmp
+	rm ${@}.in.tmp
+
+data/${NAME}.metainfo.xml: po/LINGUAS
+	msgfmt -d po -o $@ --xml --template=${@}.in
+
+po/LINGUAS: ${PO}
+	printf "%s" '${PO}' | xargs -d ' ' -I {} printf "%s\n" '{}' | sed 's/^po\/\(.*\)\.po$$/\1/' | sort > $@
+
+po/${NAME}.pot: ${POTFILES}
+	xgettext -o $@ --copyright-holder='The Spek authors' --package-name=${NAME} --package-version=${VERSION} --from-code=UTF-8 --add-comments --keyword=_ --keyword=N_ ${POTFILES}
+	for po in po/*.po; do \
+		msgmerge -o "$$po" -q "$$po" $@; \
+	done;
+
+osx:
+	@make options ${BIN} OS_FLAGS=-DOS_OSX
+
+unix:
+	@make options ${BIN} OS_FLAGS=-DOS_UNIX
+
+win:
+	@make options ${NAME}.exe EXT=.exe OS_FLAGS=-DOS_WIN
+
+${OBJ_PERF} ${OBJ_TEST}:
+	${CXX} -c ${TESTS_CXXFLAGS} ${@:.o=.cc} -o $@
+
+tests/perf${EXT}: ${LIB} ${OBJ_PERF}
+	${CXX} -o $@ ${OBJ_PERF} ${LIB} ${TESTS_LDFLAGS}
+
+tests/test${EXT}: ${LIB} ${OBJ_TEST}
+	${CXX} -o $@ ${OBJ_TEST} ${LIB} ${TESTS_LDFLAGS}
+
+check: tests/perf${EXT} tests/test${EXT}
+	cd tests && ./test${EXT} && ./perf${EXT}
+
+clean:
+	rm -f ${BIN} ${NAME}.exe ${LIB} ${OBJ} ${OBJ_LIB} ${GMO} data/${NAME}.desktop data/${NAME}.desktop.in.tmp data/${NAME}.metainfo.xml ${NAME}-${VERSION}.tar.gz tests/perf tests/perf.exe tests/perf${EXT} tests/test tests/test.exe tests/test${EXT} ${OBJ_PERF} ${OBJ_TEST}
+
+dist: clean po/${NAME}.pot
+	mkdir ${NAME}-${VERSION}
+	cp -R $$(ls -A | sed '/^\.git$$/d;/^${NAME}-${VERSION}$$/d') ${NAME}-${VERSION}
+	tar -cf ${NAME}-${VERSION}.tar ${NAME}-${VERSION}
+	gzip ${NAME}-${VERSION}.tar
+	rm -fr ${NAME}-${VERSION}
+
+install: data/${NAME}.metainfo.xml ${BIN} data/${NAME}.desktop ${GMO}
+	# appstream file
+	mkdir -p ${DESTDIR}${PREFIX}/share/metainfo
+	cp -f data/${NAME}.metainfo.xml ${DESTDIR}${PREFIX}/share/metainfo
+	chmod 644 ${DESTDIR}${PREFIX}/share/metainfo/${NAME}.metainfo.xml
+	# bin
+	mkdir -p ${DESTDIR}${PREFIX}/bin
+	cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
+	chmod 755 ${DESTDIR}${PREFIX}/bin/${BIN}
+	# desktop
+	mkdir -p ${DESTDIR}${PREFIX}/share/applications
+	cp -f data/${NAME}.desktop ${DESTDIR}${PREFIX}/share/applications
+	chmod 644 ${DESTDIR}${PREFIX}/share/applications/${NAME}.desktop
+	# doc
+	mkdir -p ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	cp -f CREDITS.md ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	chmod 644 ${DESTDIR}${PREFIX}/share/doc/${NAME}/CREDITS.md
+	cp -f LICENSE ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	chmod 644 ${DESTDIR}${PREFIX}/share/doc/${NAME}/LICENSE
+	cp -f MANUAL.md ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	chmod 644 ${DESTDIR}${PREFIX}/share/doc/${NAME}/MANUAL.md
+	cp -f README.md ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	chmod 644 ${DESTDIR}${PREFIX}/share/doc/${NAME}/README.md
+	# icons
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps
+	cp -f data/icons/16x16/${NAME}.png ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${NAME}.png
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/22x22/apps
+	cp -f data/icons/22x22/${NAME}.png ${DESTDIR}${PREFIX}/share/icons/hicolor/22x22/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/22x22/apps/${NAME}.png
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps
+	cp -f data/icons/24x24/${NAME}.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${NAME}.png
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps
+	cp -f data/icons/32x32/${NAME}.png ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${NAME}.png
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps
+	cp -f data/icons/48x48/${NAME}.png ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${NAME}.png
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	cp -f data/icons/scalable/${NAME}.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	chmod 644 ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${NAME}.svg
+	# locale
+	for gmo in po/*.gmo; do \
+		dir="$$(echo $$gmo | sed 's/^po\/\(.*\)\.gmo$$/\1/')"; \
+		mkdir -p ${DESTDIR}${PREFIX}/share/locale/$${dir}/LC_MESSAGES; \
+		cp -f $$gmo ${DESTDIR}${PREFIX}/share/locale/$${dir}/LC_MESSAGES/${NAME}.mo; \
+		chmod 644 ${DESTDIR}${PREFIX}/share/locale/$${dir}/LC_MESSAGES/${NAME}.mo; \
+	done;
+	# man
+	mkdir -p ${DESTDIR}${PREFIX}/share/man/man1
+	cp -f man/${NAME}.1 ${DESTDIR}${PREFIX}/share/man/man1
+	chmod 644 ${DESTDIR}${PREFIX}/share/man/man1/${NAME}.1
+
+uninstall:
+	rm -f ${DESTDIR}${PREFIX}/share/metainfo/${NAME}.metainfo.xml
+	rm -f ${DESTDIR}${PREFIX}/bin/${BIN}
+	rm -f ${DESTDIR}${PREFIX}/share/applications/${NAME}.desktop
+	rm -fr ${DESTDIR}${PREFIX}/share/doc/${NAME}
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${NAME}.png
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/22x22/apps/${NAME}.png
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${NAME}.png
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${NAME}.png
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${NAME}.png
+	rm -f ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${NAME}.svg
+	find ${DESTDIR}${PREFIX} -path '${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/${NAME}.mo' -exec rm -f {} \;
+	rm -f ${DESTDIR}${PREFIX}/share/man/man1/${NAME}.1
+
+.PHONY:    all options osx unix win check clean install uninstall
+.SUFFIXES: .po .gmo

Makefile.am

@@ -1,44 +0,0 @@
-SUBDIRS = \
-	data \
-	man \
-	po \
-	src \
-	tests
-
-EXTRA_DIST = \
-	CREDITS.md \
-	INSTALL.md \
-	LICENSE \
-	MANUAL.md \
-	README.md \
-	lic/Expat \
-	lic/GPL \
-	lic/IJG \
-	lic/LGPL \
-	lic/libpng \
-	lic/libtiff \
-	lic/regex \
-	lic/wxWindows \
-	lic/zlib \
-	tests/samples
-
-DISTCLEANFILES = \
-	tests/samples/perf.wav
-
-.PHONY: man upload
-
-man:
-	pandoc --standalone --to=man --output=man/spek.1 MANUAL.md
-	pandoc --standalone --to=html --output=web/man-@VERSION@.html MANUAL.md
-	sed -e 's#<I>\(http://[^<]*\)</I>#<I><a href="\1">\1</a></I>#g' -i web/man-@VERSION@.html
-	sed -e 's#<head>#<head>\
-		<style type="text/css">\
-			body {font-size: 11pt;}\
-			h1, h2, h3 {font-weight: bold;}\
-			h1 {font-size: 13pt;}\
-			h2, h3 {font-size: 12pt;}\
-		</style>#' -i web/man-@VERSION@.html
-
-upload:
-	rsync -avhz web/nginx.conf server:spek
-	rsync -avhz --delete --exclude="*.in" --exclude="nginx.conf" web/ server:spek/static

autogen.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=$(dirname "$0")
-test -n "$srcdir" || srcdir=.
-(
-  cd "$srcdir" &&
-  touch config.rpath &&
-  autoreconf -fiv
-) || exit
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

configure.ac

@@ -1,104 +0,0 @@
-AC_INIT([spek],[0.8.5])
-AC_CONFIG_SRCDIR([src/spek.cc])
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz serial-tests])
-AM_SILENT_RULES([yes])
-
-AC_LANG([C++])
-AM_PROG_AR
-AC_PROG_CXX
-CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
-AC_PROG_CXXCPP
-AC_PROG_LIBTOOL
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-
-AC_CANONICAL_HOST
-AC_MSG_CHECKING([the OS])
-AS_CASE([$host],
-	[*-*-mingw*], [
-		os="WIN"
-		AC_DEFINE([OS_WIN], [1], [Windows])
-	],
-	[*-*-darwin*], [
-		os="OSX"
-		AC_DEFINE([OS_OSX], [1], [OS X])
-	],
-	[*], [
-		os="UNIX"
-		AC_DEFINE([OS_UNIX], [1], [Unix])
-	]
-)
-AC_MSG_RESULT([$os])
-
-AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
-AC_ARG_ENABLE(
-    [valgrind],
-    AS_HELP_STRING([--enable-valgrind], [Run tests under valgrind]),
-    [use_valgrind=$enableval],
-    [use_valgrind=auto]
-)
-AS_IF(
-    [test "x$use_valgrind" = xyes -a "x$HAVE_VALGRIND" = xno], [AC_MSG_ERROR([Valgrind not found])],
-    [AM_CONDITIONAL([USE_VALGRIND], [test "x$use_valgrind" != xno -a x$HAVE_VALGRIND = xyes])]
-)
-AM_COND_IF([USE_VALGRIND], [use_valgrind=yes], [use_valgrind=no])
-
-AC_CHECK_LIB(m, log10)
-
-PKG_CHECK_MODULES(AVFORMAT, [libavformat >= 59.27.100])
-PKG_CHECK_MODULES(AVCODEC, [libavcodec >= 59.37.100])
-PKG_CHECK_MODULES(AVUTIL, [libavutil >= 57.28.100])
-
-AM_OPTIONS_WXCONFIG
-reqwx=3.1.7
-AM_PATH_WXCONFIG($reqwx, wx=1)
-if test "$wx" != 1; then
-	AC_MSG_ERROR([
-		wxWidgets must be installed on your system.
-
-		Please check that wx-config is in path, the directory
-		where wxWidgets libraries are installed (returned by
-		'wx-config --libs' or 'wx-config --static --libs' command)
-		is in LD_LIBRARY_PATH or equivalent variable and
-		wxWidgets version is $reqwx or above.
-		])
-fi
-
-GETTEXT_PACKAGE=spek
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
-AC_SUBST(GETTEXT_PACKAGE)
-AM_GNU_GETTEXT_VERSION([0.21])
-AM_GNU_GETTEXT([external])
-
-AC_CONFIG_FILES([
-	Makefile
-	data/Makefile
-	data/icons/Makefile
-	data/icons/16x16/Makefile
-	data/icons/22x22/Makefile
-	data/icons/24x24/Makefile
-	data/icons/32x32/Makefile
-	data/icons/48x48/Makefile
-	data/icons/scalable/Makefile
-	dist/osx/Info.plist
-	dist/win/spek.wxs
-	man/Makefile
-	po/Makefile.in
-	src/Makefile
-	tests/Makefile
-	web/version
-])
-AC_OUTPUT
-
-cat <<EOF
-
-${PACKAGE}-${VERSION}
-
-    Install Prefix: ${prefix}
-    C++ Compiler:   ${CXX}
-    OS:             ${os}
-    wxWidgets:      ${WX_VERSION}
-    Use Valgrind:   ${use_valgrind}
-
-EOF

data/Makefile.am

@@ -1,20 +0,0 @@
-# Makefile.am
-
-SUBDIRS = icons
-
-desktopdir = $(datadir)/applications
-desktop_in_files = spek.desktop.in
-desktop_DATA = spek.desktop
-
-appdatadir = $(datadir)/metainfo
-appdata_in_files = spek.metainfo.xml.in
-appdata_DATA = spek.metainfo.xml
-
-EXTRA_DIST = spek.desktop.in spek.metainfo.xml.in
-CLEANFILES = spek.desktop spek.metainfo.xml
-
-spek.desktop: spek.desktop.in $(wildcard $(top_srcdir)/po/*po)
-	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-spek.metainfo.xml: spek.metainfo.xml.in $(wildcard $(top_srcdir)/po/*po)
-	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@

data/icons/16x16/Makefile.am

@@ -1,14 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-

data/icons/22x22/Makefile.am

@@ -1,14 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-

data/icons/24x24/Makefile.am

@@ -1,14 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-

data/icons/32x32/Makefile.am

@@ -1,14 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-

data/icons/48x48/Makefile.am

@@ -1,14 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.png
-
-EXTRA_DIST = \
-	$(icons_DATA)
-

data/icons/Makefile.am

@@ -1,16 +0,0 @@
-# Makefile.am
-
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating GTK+ icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated. After (un)install, run this:"; \
-		echo "***  $(gtk_update_icon_cache)"; \
-	fi

data/icons/scalable/Makefile.am

@@ -1,13 +0,0 @@
-# Makefile.am
-
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	spek.svg
-
-EXTRA_DIST = \
-	$(icons_DATA)

dist/debian/docs

@@ -1,3 +0,0 @@
-LICENCE.md
-MANUAL.md
-README.md

dist/debian/patches/01_arm64-mips64el.patch

@@ -1,15 +0,0 @@
-Author: MikeWang000000 https://github.com/MikeWang000000
-Bug: https://github.com/alexkay/spek/issues/262
-Description: Build on arm64 and mips64el
-Forwarded: https://github.com/alexkay/spek/pull/232#issuecomment-1399878689
---- a/tests/test-fft.cc
-+++ b/tests/test-fft.cc
-@@ -62,7 +62,7 @@ static void test_sine()
-                 if (i == k) {
-                     continue;
-                 }
--                if (plan->get_output(i) > -150.0f) {
-+                if (plan->get_output(i) > -149.0f) {
-                     silence = false;
-                     break;
-                 }

dist/debian/patches/series

@@ -1,2 +1 @@
 00_dfsg.patch
-01_arm64-mips64el.patch

dist/debian/rules

@@ -4,3 +4,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh  $@
+
+override_dh_auto_build:
+	dh_auto_build -- unix PREFIX=/usr
+
+override_dh_auto_install:
+	dh_auto_install -- DESTDIR=$(CURDIR)/debian/spek PREFIX=/usr

dist/debian/spek.manpages

@@ -1 +0,0 @@
-man/spek.1

man/Makefile.am

@@ -1,2 +0,0 @@
-man1_MANS = spek.1
-EXTRA_DIST = spek.1

po/Makevars

@@ -1,82 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-#
-# Copyright (C) 2003-2019 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to use, copy, distribute, and modify it.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --add-comments --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = The Spek authors
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes

po/POTFILES.in

@@ -1,6 +0,0 @@
-data/spek.desktop.in
-src/spek-pipeline.cc
-src/spek-preferences-dialog.cc
-src/spek-spectrogram.cc
-src/spek-window.cc
-src/spek.cc

po/POTFILES.skip

@@ -1 +0,0 @@
-data/spek.desktop

src/Makefile.am

@@ -1,63 +0,0 @@
-noinst_LIBRARIES = libspek.a
-
-libspek_a_SOURCES = \
-	spek-audio.cc \
-	spek-audio.h \
-	spek-fft.cc \
-	spek-fft.h \
-	spek-palette.cc \
-	spek-palette.h \
-	spek-pipeline.cc \
-	spek-pipeline.h \
-	spek-utils.cc \
-	spek-utils.h
-
-libspek_a_CPPFLAGS = \
-	-include config.h \
-	-pthread \
-	$(WX_CPPFLAGS)
-
-libspek_a_CXXFLAGS = \
-	$(AVFORMAT_CFLAGS) \
-	$(AVCODEC_CFLAGS) \
-	$(AVUTIL_CFLAGS) \
-	$(WX_CXXFLAGS_ONLY)
-
-bin_PROGRAMS = spek
-
-spek_SOURCES = \
-	spek-artwork.cc \
-	spek-artwork.h \
-	spek-events.cc \
-	spek-events.h \
-	spek-platform.cc \
-	spek-platform.h \
-	spek-preferences-dialog.cc \
-	spek-preferences-dialog.h \
-	spek-preferences.cc \
-	spek-preferences.h \
-	spek-ruler.cc \
-	spek-ruler.h \
-	spek-spectrogram.cc \
-	spek-spectrogram.h \
-	spek-window.cc \
-	spek-window.h \
-	spek.cc
-
-spek_CPPFLAGS = \
-	-include config.h \
-	-pthread \
-	$(WX_CPPFLAGS)
-
-spek_CXXFLAGS = \
-	$(WX_CXXFLAGS_ONLY)
-
-spek_LDADD = \
-	libspek.a \
-	$(AVFORMAT_LIBS) \
-	$(AVCODEC_LIBS) \
-	$(AVUTIL_LIBS) \
-	$(WX_LIBS)
-
-spek_LDFLAGS = \
-	-pthread

src/spek-window.cc

@@ -8,7 +8,7 @@
 // WX on WIN doesn't like it when pthread.h is included first.
 #include <pthread.h>
 
-#include <spek-utils.h>
+#include "spek-utils.h"
 
 #include "spek-artwork.h"
 #include "spek-preferences-dialog.h"

tests/Makefile.am

@@ -1,39 +0,0 @@
-TESTS = \
-	test \
-	perf
-
-if USE_VALGRIND
-TESTS_ENVIRONMENT = valgrind --leak-check=full --quiet --error-exitcode=1
-endif
-
-check_PROGRAMS = $(TESTS)
-
-perf_SOURCES = \
-	perf.cc
-
-test_SOURCES = \
-	test-audio.cc \
-	test-fft.cc \
-	test-utils.cc \
-	test.cc \
-	test.h
-
-AM_CPPFLAGS = \
-	-include config.h \
-	-I$(top_srcdir)/src \
-	-DSAMPLES_DIR=\"$(srcdir)/samples\" \
-	-pthread
-
-AM_CXXFLAGS = \
-	$(AVFORMAT_CFLAGS) \
-	$(AVCODEC_CFLAGS) \
-	$(AVUTIL_CFLAGS)
-
-LDADD = \
-	../src/libspek.a \
-	$(AVFORMAT_LIBS) \
-	$(AVCODEC_LIBS) \
-	$(AVUTIL_LIBS)
-
-AM_LDFLAGS = \
-	-pthread