Fix build, use SPDX license

- Update website URL
- Use SPDX license
- Update source tarball URL
- Use patches from Debian to fix build

15 files changed, 754 insertions, 128 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebeba0e72a06..a76fe1a5610f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,46 @@
-# Generated by mksrcinfo v8
-# Sun Dec 10 21:41:57 UTC 2017
 pkgbase = buzztrax
 	pkgdesc = Modular music composer for Linux
 	pkgver = 0.10.2
-	pkgrel = 1
-	url = http://buzztrax.org/
+	pkgrel = 2
+	url = https://www.buzztrax.org/
 	arch = x86_64
-	license = GPL
-	license = FDL
+	license = LGPL-2.1-or-later
+	license = GFDL-1.1-or-later
 	makedepends = fluidsynth
 	makedepends = gobject-introspection
 	makedepends = intltool
 	makedepends = rarian
 	makedepends = gtk-doc
 	depends = clutter-gtk
-	depends = fluidsynth
 	depends = gst-plugins-base-libs
 	depends = libgsf
 	optdepends = gst-plugins-ugly: for the use of mp3 recording
 	optdepends = gst-plugins-bad: extra audio effects
 	optdepends = fluidsynth: to build a relates gstreamer wrapper
 	replaces = buzztard
-	source = http://files.buzztrax.org/releases/buzztrax-0.10.2.tar.gz
-	source = 0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch
-	sha256sums = 675ed744cd5209dda11e1d2fcd621d6ca23bf2eac89230bbd39242fe5f4000ed
-	sha256sums = 7866edce48a9b7375ae0c38b9dc8565ecac80dc8ad31e772a8d178f487f8f136
+	source = https://github.com/Buzztrax/buzztrax/releases/download/RELEASE_0_10_2/buzztrax-0.10.2.tar.gz
+	source = 0001-about-dialog-take-release-year-and-release-date-from.patch
+	source = 0002-build-Fix-32-bit-bml-build.patch
+	source = 0003-configure-add-msee-when-using-xmmintin.h.patch
+	source = 0004-configure-fix-the-header-name-mess.patch
+	source = 0005-bt-dec-rename-plugin.patch
+	source = 0006-gtk-update-icon-cache.patch
+	source = 0007-add-gobject-casts.patch
+	source = 0008-replace-deprecated-fluid_settings_getstr.patch
+	source = 0009-replace-deprecated-fluid_synth_set_midi_router.patch
+	source = 0010-fix-build-fluidsynth-2.patch
+	source = 0011-fix-udevadm-path.patch
+	sha256sums = d90b92f822902a9b3f51572d63d5d779bf592e9af3b27bbf899d373e74f8e3bb
+	sha256sums = 9e899afb9e596abffa90f4bb1062e82e0737fef0bac4eb4ce2ee5ed9e2551cae
+	sha256sums = 88a492689533b31cf95415496a5030db0554f337bf51c62e427090b4f708a2ce
+	sha256sums = cd21a197839544335d6bc85941f9d9b4ec23a9aefaf69d38d6b7ae7a5b9c29b8
+	sha256sums = 60c7b6b74664572f1a45d39cce685791674297d55d6b7b20810e4547583d6620
+	sha256sums = 03d498940515370d0b575e403ea06f67778516053a339f7ddbc4602e534771d0
+	sha256sums = 37492f89792d7a914485fe0dbfc8354d65b0244bbc865929151c6b2ecbe6cb0a
+	sha256sums = c2bf1fc8713c66c506992b5a26bc083dd380dab4b7ee99741b836e487de6ff8c
+	sha256sums = dbf858de8747e6e63cff8e7babb2fb2442eb74bddf432063bc6b8d54ca282698
+	sha256sums = ed2652eb90b03573f7cd81149915bf3e3f9694446eb53ad198ff64e52ba50f75
+	sha256sums = 334a43fcf82d6f756bfc93bcf9aab4a3d89901421808402556dd188edfe801f2
+	sha256sums = ee2fe8f27709c846ddfe9800e3760bb47fd7c9ad30f999622d930a11d28171af
 
 pkgname = buzztrax
-
diff --git a/0001-about-dialog-take-release-year-and-release-date-from.patch b/0001-about-dialog-take-release-year-and-release-date-from.patch
new file mode 100644
index 000000000000..8e1d41458e9e
--- /dev/null
+++ b/0001-about-dialog-take-release-year-and-release-date-from.patch
@@ -0,0 +1,58 @@
+From bf2d6b4ab2beb1105fce8c1a8fae2b14c25045c2 Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Thu, 10 Dec 2015 21:14:07 +0100
+Subject: [PATCH 1/4] about-dialog: take release year and release date from
+ NEWS
+
+When building git head use current date, otherwise reuse the date from NEWS.
+---
+ configure.ac               | 12 ++++++++++--
+ src/ui/edit/about-dialog.c |  2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cd08e3f..3b7c920 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,8 +49,15 @@ AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR", [gstreamer series])
+ AC_SUBST(GST_MAJORMINOR)
+ 
+ dnl release year and date
+-BT_RELEASE_YEAR=`date +%Y`
+-BT_RELEASE_DATE=`date +%Y-%m-%d`
++DATE_STAMP=`head -n1 NEWS | sed 's/^[[^(]]*(\(.*\)).*$/\1/'`
++if test "$DATE_STAMP" == "XX.XXX.XXXX"; then
++  BT_RELEASE_YEAR=`date +%Y`
++  BT_RELEASE_DATE=`date +%Y-%m-%d`
++else
++  IFS="." read -r d m y <<< "$DATE_STAMP"
++  BT_RELEASE_YEAR="$y"
++  BT_RELEASE_DATE=`date -d "%d %m %y" +%Y-%m-%d`
++fi
+ 
+ AC_SUBST(BT_MAJOR_VERSION)
+ AC_SUBST(BT_MINOR_VERSION)
+@@ -62,6 +69,7 @@ AC_SUBST(BT_RELEASE_DATE)
+ 
+ AC_DEFINE_UNQUOTED(BT_VERSION, "$BT_VERSION", [library version as string])
+ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER, 900, [version as a number])
++AC_DEFINE_UNQUOTED(BT_RELEASE_YEAR, $BT_RELEASE_YEAR, [release year])
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+diff --git a/src/ui/edit/about-dialog.c b/src/ui/edit/about-dialog.c
+index d2ff4bc..a85bf31 100644
+--- a/src/ui/edit/about-dialog.c
++++ b/src/ui/edit/about-dialog.c
+@@ -68,7 +68,7 @@ bt_about_dialog_init_ui (const BtAboutDialog * self)
+       g_alloca (strlen (_("Copyright \xc2\xa9 2003-%d Buzztrax developer team"))
+       + 3);
+   sprintf (copyright, _("Copyright \xc2\xa9 2003-%d Buzztrax developer team"),
+-      2014);
++      BT_RELEASE_YEAR);
+ 
+   /* we can get logo via icon name, so this here is just for educational purpose
+      GdkPixbuf *logo;
+-- 
+2.6.4
+
diff --git a/0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch b/0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch
deleted file mode 100644
index 6ddc2c48b8d2..000000000000
--- a/0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 9c5ebca1509558fde91ed1cd75784cd5f0dd9f69 Mon Sep 17 00:00:00 2001
-From: Stefan Sauer <ensonic@users.sf.net>
-Date: Sun, 26 Jun 2016 12:58:33 +0200
-Subject: [PATCH] tests: prefer AM_TESTS_ENVIRONMENT to make automake happy
-
-The new test runner seems to require this variable.
-See #68
----
- Makefile.tests.am                  | 2 +-
- docs/reference/bt-cmd/Makefile.am  | 2 +-
- docs/reference/bt-core/Makefile.am | 2 +-
- docs/reference/bt-edit/Makefile.am | 2 +-
- docs/reference/bt-gst/Makefile.am  | 2 +-
- docs/reference/bt-ic/Makefile.am   | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.tests.am b/Makefile.tests.am
-index b7ce34c..0184931 100644
---- a/Makefile.tests.am
-+++ b/Makefile.tests.am
-@@ -37,7 +37,7 @@ CHECK_REGISTRY = $(top_builddir)/tests/test-registry.reg
- # for gtk/x11 issues
- #    GDK_SYNCHRONIZE=1
- #
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
- 	CK_DEFAULT_TIMEOUT=20 \
- 	LANG=C \
- 	XDG_CACHE_HOME=$(abs_builddir) \
-diff --git a/docs/reference/bt-cmd/Makefile.am b/docs/reference/bt-cmd/Makefile.am
-index 91ddb30..d1a9652 100644
---- a/docs/reference/bt-cmd/Makefile.am
-+++ b/docs/reference/bt-cmd/Makefile.am
-@@ -89,7 +89,7 @@ EXTRA_DIST += \
- 
- # Comment this out if you want your docs-status tested during 'make check'
- if ENABLE_GTK_DOC
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
- 	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
- 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
- TESTS = $(GTKDOC_CHECK)
-diff --git a/docs/reference/bt-core/Makefile.am b/docs/reference/bt-core/Makefile.am
-index 9cf0049..f559ca9 100644
---- a/docs/reference/bt-core/Makefile.am
-+++ b/docs/reference/bt-core/Makefile.am
-@@ -73,7 +73,7 @@ EXTRA_DIST += $(DOC_MODULE).types
- 
- # Comment this out if you want your docs-status tested during 'make check'
- if ENABLE_GTK_DOC
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
- 	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
- 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
- TESTS = $(GTKDOC_CHECK)
-diff --git a/docs/reference/bt-edit/Makefile.am b/docs/reference/bt-edit/Makefile.am
-index 11542e3..e3ccca0 100644
---- a/docs/reference/bt-edit/Makefile.am
-+++ b/docs/reference/bt-edit/Makefile.am
-@@ -92,7 +92,7 @@ EXTRA_DIST += \
- 
- # Comment this out if you want your docs-status tested during 'make check'
- if ENABLE_GTK_DOC
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
- 	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
- 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
- TESTS = $(GTKDOC_CHECK)
-diff --git a/docs/reference/bt-gst/Makefile.am b/docs/reference/bt-gst/Makefile.am
-index eaddd9b..2f4df52 100644
---- a/docs/reference/bt-gst/Makefile.am
-+++ b/docs/reference/bt-gst/Makefile.am
-@@ -96,7 +96,7 @@ EXTRA_DIST += $(DOC_MODULE).types
- 
- # Comment this out if you want your docs-status tested during 'make check'
- if ENABLE_GTK_DOC
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
-   DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
- 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
- 
-diff --git a/docs/reference/bt-ic/Makefile.am b/docs/reference/bt-ic/Makefile.am
-index 60bdf7d..3ee7c6e 100644
---- a/docs/reference/bt-ic/Makefile.am
-+++ b/docs/reference/bt-ic/Makefile.am
-@@ -90,7 +90,7 @@ EXTRA_DIST += $(DOC_MODULE).types
- 
- # Comment this out if you want your docs-status tested during 'make check'
- if ENABLE_GTK_DOC
--TESTS_ENVIRONMENT = \
-+AM_TESTS_ENVIRONMENT = \
- 	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
- 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
- TESTS = $(GTKDOC_CHECK)
--- 
-2.9.0
-
diff --git a/0002-build-Fix-32-bit-bml-build.patch b/0002-build-Fix-32-bit-bml-build.patch
new file mode 100644
index 000000000000..b0652082442c
--- /dev/null
+++ b/0002-build-Fix-32-bit-bml-build.patch
@@ -0,0 +1,26 @@
+From c4463a2e487c3d94a85b2d7e8cd06d6de14a807b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Wed, 30 Dec 2015 15:33:24 +0200
+Subject: [PATCH 2/4] build: Fix 32 bit bml build
+
+Follow up for ef2b064e520dd47030cc3a58abe6ab13db9f5fd3 to
+add all needed include directories to libbml_la_CFLAGS too.
+---
+ Makefile.src.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.src.am b/Makefile.src.am
+index aee876c..fc24146 100644
+--- a/Makefile.src.am
++++ b/Makefile.src.am
+@@ -112,6 +112,7 @@ libbml_HEADERS = src/lib/bml/bml.h src/lib/bml/BuzzMachineLoader/BuzzMachineLoad
+ libbml_la_SOURCES = src/lib/bml/bml.c src/lib/bml/bmllog.c $(DLLWRAPPER_SRC)
+ libbml_la_CFLAGS = \
+   -I$(srcdir) -I$(top_srcdir)/src/lib \
++  -I$(top_srcdir)/src/lib/dllwrapper \
+   $(PTHREAD_CFLAGS) $(BML_CFLAGS)
+ libbml_la_CPPFLAGS = -DNATIVE_BML_DIR="\"$(pkglibdir)\""
+ libbml_la_LIBADD = $(LIBM) $(PTHREAD_LIBS) $(BML_LIBS) $(DLLWRAPPER_LIB)
+-- 
+2.6.4
+
diff --git a/0003-configure-add-msee-when-using-xmmintin.h.patch b/0003-configure-add-msee-when-using-xmmintin.h.patch
new file mode 100644
index 000000000000..8d5b33a1ac82
--- /dev/null
+++ b/0003-configure-add-msee-when-using-xmmintin.h.patch
@@ -0,0 +1,104 @@
+From 0ad59584f9a8dfb613a9b7fd89a78f6adfef503d Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Wed, 30 Dec 2015 15:08:39 +0100
+Subject: [PATCH 3/4] configure: add -msee when using xmmintin.h
+
+Fixes #57
+---
+ configure.ac        | 29 ++++++++++++++++++++++-------
+ src/lib/core/core.c | 10 +++++++---
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3b7c920..5b5681a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -538,17 +538,32 @@ AC_CHECK_DECL(sysi86,[
+ ])
+ 
+ dnl check for SSE intrisics
++have_mmx_intrinsics=no
+ ARCH_CFLAGS=""
+-ARCH_CPPFLAGS=""
+ case "x${target_cpu}" in
+   xi?86|k?|xx86_64|xamd64)
+-    # seems to cause "CPU you selected does not support x86-64 instruction set" on some targets
+-    #ARCH_CFLAGS="-march=native"
+-    ARCH_CPPFLAGS="-D__SSE__ -D__MMX__"
+-    AC_CHECK_HEADERS([xmmintrin.h])
++    AC_CHECK_HEADERS([xmmintrin.h],
++      [
++        SAVED_CFLAGS="${CFLAGS}"
++        AC_MSG_CHECKING([for working mmx intrinsics])
++        CFLAGS="-mmmx -msse"
++        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
++                          #include <mmintrin.h>
++                          int main () {
++                              _mm_getcsr ();
++                          }]])], [
++                          AC_MSG_RESULT(yes)
++                          have_mmx_intrinsics=yes],[
++                          AC_MSG_RESULT(no)])
++        CFLAGS="${SAVED_CFLAGS}"
++        ARCH_CFLAGS="-mmmx -msse"
++      ],[])
+     ;;
+ esac
+-
++if test $have_mmx_intrinsics = yes ; then
++   AC_DEFINE(USE_X86_MMX, 1, [use x86 MMX compiler intrinsics])
++   ARCH_CFLAGS="-mmmx -msse"
++fi
+ 
+ dnl check for libraries
+ LT_LIB_M
+@@ -593,7 +608,7 @@ AC_ARG_ENABLE(Bsymbolic,
+ dnl Extra vars
+ BT_INCLUDEDIR='-I${includedir}'
+ dnl -Wl,--as-needed # can be put into CFLAGS to drop all unused libs
+-BT_CFLAGS="$ARCH_CFLAGS $ARCH_CPPFLAGS $DEBUG_CFLAGS $COVERAGE_CFLAGS $BT_DISABLE_DEPRECATED"
++BT_CFLAGS="$ARCH_CFLAGS $DEBUG_CFLAGS $COVERAGE_CFLAGS $BT_DISABLE_DEPRECATED"
+ BT_LIBDIR='-L${libdir}'
+ BT_LIBS="$COVERAGE_LIBS"
+ BT_LDFLAGS="$DEBUG_LDFLAGS"
+diff --git a/src/lib/core/core.c b/src/lib/core/core.c
+index 6a03d5e..f9d2061 100644
+--- a/src/lib/core/core.c
++++ b/src/lib/core/core.c
+@@ -32,14 +32,16 @@
+ 
+ #ifdef HAVE_SCHED_SETSCHEDULER
+ #include <sched.h>
+-#if HAVE_MLOCKALL
++#ifdef HAVE_MLOCKALL
+ #include <sys/mman.h>
+ #endif
+ #endif
+ 
+-#if HAVE_XMMINTRIN_H
++#ifdef USE_X86_MMX
++#ifdef HAVE_XMMINTRIN_H
+ #include <xmmintrin.h>
+ #endif
++#endif
+ 
+ /**
+  * bt_major_version:
+@@ -145,11 +147,13 @@ bt_init_post (void)
+ #endif
+ #endif
+ 
+-#if HAVE_XMMINTRIN_H
++#if USE_X86_MMX
+   // TODO(ensonic): we need to probe the CPU capabilities
+   // see http://www.mail-archive.com/linux-audio-dev@music.columbia.edu/msg19520.html
+   //   [linux-audio-dev] Channels and best practice
+   // _MM_FLUSH_ZERO_ON = FZ
++  // TODO(ensonic): wikipedia says we must do this for each thread:
++  // https://en.wikipedia.org/wiki/Denormal_number#Disabling_denormal_floats_at_the_code_level
+   _mm_setcsr (_mm_getcsr () | 0x8040);  // set DAZ and FZ bits
+ #endif
+ 
+-- 
+2.6.4
+
diff --git a/0004-configure-fix-the-header-name-mess.patch b/0004-configure-fix-the-header-name-mess.patch
new file mode 100644
index 000000000000..5d58ddab318c
--- /dev/null
+++ b/0004-configure-fix-the-header-name-mess.patch
@@ -0,0 +1,81 @@
+From 544425a2351992ba5b4ae952615fc3d70a7a9623 Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Wed, 30 Dec 2015 17:00:18 +0100
+Subject: [PATCH 4/4] configure: fix the header name mess
+
+Follow up for 7a0eb4ac95399f04e56e85badb183495a29cdd67. Apparently the names
+of the header files are purely random here. We actually need xmmintrin.h, but
+x!=mmx, but sse (haha).
+
+See issue #57.
+---
+ configure.ac        | 12 ++++++------
+ src/lib/core/core.c |  4 ++--
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5b5681a..1538c52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -538,30 +538,30 @@ AC_CHECK_DECL(sysi86,[
+ ])
+ 
+ dnl check for SSE intrisics
+-have_mmx_intrinsics=no
++have_sse_intrinsics=no
+ ARCH_CFLAGS=""
+ case "x${target_cpu}" in
+   xi?86|k?|xx86_64|xamd64)
+     AC_CHECK_HEADERS([xmmintrin.h],
+       [
+         SAVED_CFLAGS="${CFLAGS}"
+-        AC_MSG_CHECKING([for working mmx intrinsics])
++        AC_MSG_CHECKING([for working sse intrinsics])
+         CFLAGS="-mmmx -msse"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+-                          #include <mmintrin.h>
++                          #include <xmmintrin.h>
+                           int main () {
+                               _mm_getcsr ();
+                           }]])], [
+                           AC_MSG_RESULT(yes)
+-                          have_mmx_intrinsics=yes],[
++                          have_sse_intrinsics=yes],[
+                           AC_MSG_RESULT(no)])
+         CFLAGS="${SAVED_CFLAGS}"
+         ARCH_CFLAGS="-mmmx -msse"
+       ],[])
+     ;;
+ esac
+-if test $have_mmx_intrinsics = yes ; then
+-   AC_DEFINE(USE_X86_MMX, 1, [use x86 MMX compiler intrinsics])
++if test $have_sse_intrinsics = yes ; then
++   AC_DEFINE(USE_X86_SSE, 1, [use x86 SSE compiler intrinsics])
+    ARCH_CFLAGS="-mmmx -msse"
+ fi
+ 
+diff --git a/src/lib/core/core.c b/src/lib/core/core.c
+index f9d2061..3742cb5 100644
+--- a/src/lib/core/core.c
++++ b/src/lib/core/core.c
+@@ -37,7 +37,7 @@
+ #endif
+ #endif
+ 
+-#ifdef USE_X86_MMX
++#ifdef USE_X86_SSE
+ #ifdef HAVE_XMMINTRIN_H
+ #include <xmmintrin.h>
+ #endif
+@@ -147,7 +147,7 @@ bt_init_post (void)
+ #endif
+ #endif
+ 
+-#if USE_X86_MMX
++#if USE_X86_SSE
+   // TODO(ensonic): we need to probe the CPU capabilities
+   // see http://www.mail-archive.com/linux-audio-dev@music.columbia.edu/msg19520.html
+   //   [linux-audio-dev] Channels and best practice
+-- 
+2.6.4
+
diff --git a/0005-bt-dec-rename-plugin.patch b/0005-bt-dec-rename-plugin.patch
new file mode 100644
index 000000000000..14e29b59c9e6
--- /dev/null
+++ b/0005-bt-dec-rename-plugin.patch
@@ -0,0 +1,25 @@
+From a89abcf781c8a6b6940220fd291858c9d5b1c89c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Sun, 2 Jul 2017 20:50:48 +0200
+Subject: [PATCH] bt-dec: rename plugin
+
+The macro is not autoformat friendly. If the name contains a '-', the formatter
+will insert spaces and break the macro.
+---
+ src/gst/dec/bt-dec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gst/dec/bt-dec.c b/src/gst/dec/bt-dec.c
+index 37b5f58b..2ac54372 100644
+--- a/src/gst/dec/bt-dec.c
++++ b/src/gst/dec/bt-dec.c
+@@ -947,6 +947,6 @@ plugin_init (GstPlugin * plugin)
+ 
+ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+     GST_VERSION_MINOR,
+-    buzztrax - dec,
++    buzztraxdec,
+     "Buzztrax song renderer",
+     plugin_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.buzztrax.org");
+-- 
+2.16.3
diff --git a/0006-gtk-update-icon-cache.patch b/0006-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..2931f7ae08ad
--- /dev/null
+++ b/0006-gtk-update-icon-cache.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-05-31 16:56:50.541720041 +0300
++++ b/configure.ac	2018-05-31 16:57:00.125957415 +0300
+@@ -614,7 +614,7 @@
+ 
+ AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database)
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
+-AC_PATH_PROG(UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
++AC_PATH_PROG(UPDATE_ICON_CACHE, gtk-update-icon-cache)
+ 
+ dnl Substitutes
+ 
diff --git a/0007-add-gobject-casts.patch b/0007-add-gobject-casts.patch
new file mode 100644
index 000000000000..16253ec33714
--- /dev/null
+++ b/0007-add-gobject-casts.patch
@@ -0,0 +1,97 @@
+Description: 
+ Add casts to/from GObject to allow code to be built with 
+ -Werror=incompatible-pointer-types
+ (which I wanted for work on the fluidsynth stuff)
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- buzztrax-0.10.2.orig/src/lib/core/audio-session.c
++++ buzztrax-0.10.2/src/lib/core/audio-session.c
+@@ -226,7 +226,7 @@ bt_audio_session_constructor (GType type
+     singleton = BT_AUDIO_SESSION (object);
+     g_object_add_weak_pointer (object, (gpointer *) (gpointer) & singleton);
+   } else {
+-    object = g_object_ref (singleton);
++    object = (GObject *)(g_object_ref (singleton));
+   }
+   return object;
+ }
+--- buzztrax-0.10.2.orig/src/lib/core/machine.c
++++ buzztrax-0.10.2/src/lib/core/machine.c
+@@ -1982,7 +1982,7 @@ bt_machine_get_pattern_by_id (const BtMa
+     pattern = (GObject *) node->data;
+     if (!g_strcmp0 (g_object_get_data (pattern, "BtPattern::id"), id)) {
+       GST_INFO ("legacy pattern lookup for '%s' = %p", id, pattern);
+-      return g_object_ref (pattern);
++      return (BtCmdPattern *)(g_object_ref (pattern));
+     }
+   }
+   return NULL;
+--- buzztrax-0.10.2.orig/src/lib/ic/registry.c
++++ buzztrax-0.10.2/src/lib/ic/registry.c
+@@ -246,7 +246,7 @@ btic_registry_constructor (GType type, g
+     singleton->priv->gudev_discoverer = btic_gudev_discoverer_new ();
+ #endif
+   } else {
+-    object = g_object_ref (singleton);
++    object = (GObject *)(g_object_ref (singleton));
+   }
+   return object;
+ }
+--- buzztrax-0.10.2.orig/src/ui/edit/change-log.c
++++ buzztrax-0.10.2/src/ui/edit/change-log.c
+@@ -1153,7 +1153,7 @@ bt_change_log_constructor (GType type, g
+     singleton = BT_CHANGE_LOG (object);
+     g_object_add_weak_pointer (object, (gpointer *) (gpointer) & singleton);
+   } else {
+-    object = g_object_ref (singleton);
++    object = (GObject *)(g_object_ref (singleton));
+   }
+   return object;
+ }
+--- buzztrax-0.10.2.orig/src/ui/edit/edit-application.c
++++ buzztrax-0.10.2/src/ui/edit/edit-application.c
+@@ -930,7 +930,7 @@ bt_edit_application_constructor (GType t
+         G_OBJECT_LOG_REF_COUNT (singleton));
+     //GST_DEBUG(">>>");
+   } else {
+-    object = g_object_ref (singleton);
++    object = (GObject *)(g_object_ref (singleton));
+   }
+   return object;
+ }
+--- buzztrax-0.10.2.orig/src/ui/edit/main-page-sequence.c
++++ buzztrax-0.10.2/src/ui/edit/main-page-sequence.c
+@@ -653,9 +653,9 @@ pattern_list_model_get_pattern_by_key (G
+     gtk_tree_model_get (store, &iter, BT_PATTERN_LIST_MODEL_SHORTCUT, &this_key,
+         -1);
+     if (this_key[0] == that_key) {
+-      pattern =
++      pattern = (BtCmdPattern *)(
+           g_object_ref (bt_pattern_list_model_get_object ((BtPatternListModel *)
+-              store, &iter));
++              store, &iter)));
+       GST_INFO ("found pattern for key : %" G_OBJECT_REF_COUNT_FMT,
+           G_OBJECT_LOG_REF_COUNT (pattern));
+       g_free (this_key);
+--- buzztrax-0.10.2.orig/src/ui/edit/settings-page-interaction-controller.c
++++ buzztrax-0.10.2/src/ui/edit/settings-page-interaction-controller.c
+@@ -186,7 +186,7 @@ on_device_menu_changed (GtkComboBox * co
+     g_list_free (list);
+ 
+     // activate the new one
+-    self->priv->device = g_object_ref (device);
++    self->priv->device = (BtIcDevice *)(g_object_ref (device));
+     start_device (self);
+   }
+   GST_INFO ("control list refreshed");
+--- buzztrax-0.10.2.orig/src/ui/edit/ui-resources.c
++++ buzztrax-0.10.2/src/ui/edit/ui-resources.c
+@@ -429,7 +429,7 @@ bt_ui_resources_constructor (GType type,
+     g_object_unref (settings);
+     g_object_unref (app);
+   } else {
+-    object = g_object_ref (singleton);
++    object = (GObject *)(g_object_ref (singleton));
+   }
+   return object;
+ }
diff --git a/0008-replace-deprecated-fluid_settings_getstr.patch b/0008-replace-deprecated-fluid_settings_getstr.patch
new file mode 100644
index 000000000000..c74c8cb6e7c0
--- /dev/null
+++ b/0008-replace-deprecated-fluid_settings_getstr.patch
@@ -0,0 +1,28 @@
+This patch is based on the git commit detailed below, but with the
+configure.ac changes removed.
+
+commit b39563b237f82408bc4929d38d52d6ebd4a513b7
+Author: David Beswick <dlbeswick@gmail.com>
+Date:   Wed Aug 7 08:03:39 2019 +0200
+
+    fluidsynth: replace deprecated fluid_settings_getstr()
+    
+    Simply depend on fluidsynth >=1.1.0 which introduced the new function to not
+    clutter the code with ifdefs.
+
+diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c
+index c3263980..9e407590 100644
+--- a/src/gst/fluidsynth/fluidsynth.c
++++ b/src/gst/fluidsynth/fluidsynth.c
+@@ -587,9 +587,9 @@ gstbt_fluid_synth_get_property (GObject * object, guint prop_id,
+           g_value_set_double (value, d);
+         break;
+       case G_TYPE_STRING:
+-        retval = fluid_settings_getstr (src->settings, name, &s);
++        retval = fluid_settings_dupstr (src->settings, name, &s);
+         if (retval)
+-          g_value_set_string (value, s);
++          g_value_take_string (value, s);
+         break;
+       default:
+         g_critical ("Unexpected FluidSynth dynamic property type");
diff --git a/0009-replace-deprecated-fluid_synth_set_midi_router.patch b/0009-replace-deprecated-fluid_synth_set_midi_router.patch
new file mode 100644
index 000000000000..9da5b8636a86
--- /dev/null
+++ b/0009-replace-deprecated-fluid_synth_set_midi_router.patch
@@ -0,0 +1,64 @@
+commit a3e7447885137a7569da948b5fb847829dfdb835
+Author: David Beswick <dlbeswick@gmail.com>
+Date:   Thu Aug 8 08:14:50 2019 +0200
+
+    fluidsynth: replace deprecated fluid_synth_set_midi_router
+    
+    Use a thread_safe command_handler instead.
+
+diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c
+index 9e407590..0d954f8e 100644
+--- a/src/gst/fluidsynth/fluidsynth.c
++++ b/src/gst/fluidsynth/fluidsynth.c
+@@ -671,11 +671,14 @@ gstbt_fluid_synth_dispose (GObject * object)
+     delete_fluid_midi_driver (gstsynth->midi);
+   if (gstsynth->midi_router)
+     delete_fluid_midi_router (gstsynth->midi_router);
++  if (gstsynth->cmd_handler)
++    delete_fluid_cmd_handler (gstsynth->cmd_handler);
+   if (gstsynth->fluid)
+     delete_fluid_synth (gstsynth->fluid);
+ 
+   gstsynth->midi = NULL;
+   gstsynth->midi_router = NULL;
++  gstsynth->cmd_handler = NULL;
+   gstsynth->fluid = NULL;
+ 
+   g_free (gstsynth->instrument_patch_path);
+@@ -719,14 +722,17 @@ gstbt_fluid_synth_init (GstBtFluidSynth * src)
+   /* create MIDI router to send MIDI to FluidSynth */
+   src->midi_router =
+       new_fluid_midi_router (src->settings,
+-      fluid_synth_handle_midi_event, (void *) src);
++      fluid_synth_handle_midi_event, src->fluid);
+   if (src->midi_router) {
+-    fluid_synth_set_midi_router (src->fluid, src->midi_router);
+-    src->midi =
+-        new_fluid_midi_driver (src->settings,
+-        fluid_midi_router_handle_midi_event, (void *) (src->midi_router));
+-    if (!src->midi)
+-      g_warning ("Failed to create FluidSynth MIDI input driver");
++    src->cmd_handler = new_fluid_cmd_handler (src->fluid);
++    if (src->cmd_handler) {
++      src->midi = new_fluid_midi_driver (src->settings,
++          fluid_midi_router_handle_midi_event, (void *) (src->midi_router));
++      if (!src->midi)
++        g_warning ("Failed to create FluidSynth MIDI input driver");
++    } else {
++      g_warning ("Failed to create FluidSynth MIDI cmd handler");
++    }
+   } else
+     g_warning ("Failed to create MIDI input router");
+ 
+diff --git a/src/gst/fluidsynth/fluidsynth.h b/src/gst/fluidsynth/fluidsynth.h
+index 4676b716..c079b477 100644
+--- a/src/gst/fluidsynth/fluidsynth.h
++++ b/src/gst/fluidsynth/fluidsynth.h
+@@ -93,6 +93,7 @@ struct _GstBtFluidSynth {
+   fluid_settings_t *settings;       /* to free on close */
+   fluid_midi_driver_t *midi;		    /* FluidSynth MIDI driver */
+   fluid_midi_router_t *midi_router; /* FluidSynth MIDI router */
++  fluid_cmd_handler_t *cmd_handler;
+ 
+   gchar *instrument_patch_path;
+   gint instrument_patch;
diff --git a/0010-fix-build-fluidsynth-2.patch b/0010-fix-build-fluidsynth-2.patch
new file mode 100644
index 000000000000..9a1469c2ce0f
--- /dev/null
+++ b/0010-fix-build-fluidsynth-2.patch
@@ -0,0 +1,129 @@
+commit 3ac7cbf1a712c3f4db7a34a6d3b46dc9a43172d3
+Author: Peter Michael Green <plugwash@debian.org>
+Date:   Thu Dec 19 01:38:18 2019 +0000
+
+    Fix build with fluidsynth 2.x
+
+diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c
+index 0d954f8e..ec598dc4 100644
+--- a/src/gst/fluidsynth/fluidsynth.c
++++ b/src/gst/fluidsynth/fluidsynth.c
+@@ -132,25 +132,41 @@ G_DEFINE_TYPE (GstBtFluidSynth, gstbt_fluid_synth, GSTBT_TYPE_AUDIO_SYNTH);
+ //-- fluid_synth log handler
+ 
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ gstbt_fluid_synth_error_log_function (int level, char *message, void *data)
++#else
++gstbt_fluid_synth_error_log_function (int level, const char *message, void *data)
++#endif
+ {
+   GST_ERROR ("%s", message);
+ }
+ 
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ gstbt_fluid_synth_warning_log_function (int level, char *message, void *data)
++#else
++gstbt_fluid_synth_warning_log_function (int level, const char *message, void *data)
++#endif
+ {
+   GST_WARNING ("%s", message);
+ }
+ 
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ gstbt_fluid_synth_info_log_function (int level, char *message, void *data)
++#else
++gstbt_fluid_synth_info_log_function (int level, const char *message, void *data)
++#endif
+ {
+   GST_INFO ("%s", message);
+ }
+ 
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ gstbt_fluid_synth_debug_log_function (int level, char *message, void *data)
++#else
++gstbt_fluid_synth_debug_log_function (int level, const char *message, void *data)
++#endif
+ {
+   GST_DEBUG ("%s", message);
+ }
+@@ -212,7 +228,11 @@ typedef struct
+ 
+ /* for counting the number of FluidSynth settings properties */
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ settings_foreach_count (void *data, char *name, int type)
++#else
++settings_foreach_count (void *data, const char *name, int type)
++#endif
+ {
+   int *count = (int *) data;
+   *count = *count + 1;
+@@ -220,7 +240,11 @@ settings_foreach_count (void *data, char *name, int type)
+ 
+ /* add each FluidSynth setting as a GObject property */
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ settings_foreach_func (void *data, char *name, int type)
++#else
++settings_foreach_func (void *data, const char *name, int type)
++#endif
+ {
+   ForeachBag *bag = (ForeachBag *) data;
+   GParamSpec *spec;
+@@ -231,18 +255,30 @@ settings_foreach_func (void *data, char *name, int type)
+   switch (type) {
+     case FLUID_NUM_TYPE:
+       fluid_settings_getnum_range (bag->settings, name, &dmin, &dmax);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+       ddef = fluid_settings_getnum_default (bag->settings, name);
++#else
++      if (fluid_settings_getnum_default (bag->settings, name, &ddef) != FLUID_OK) ddef = 0;
++#endif
+       spec = g_param_spec_double (name, name, name, dmin, dmax, ddef,
+           G_PARAM_READWRITE);
+       break;
+     case FLUID_INT_TYPE:
+       fluid_settings_getint_range (bag->settings, name, &imin, &imax);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+       idef = fluid_settings_getint_default (bag->settings, name);
++#else
++      if (fluid_settings_getint_default (bag->settings, name, &idef) != FLUID_OK) idef = 0;
++#endif
+       spec = g_param_spec_int (name, name, name, imin, imax, idef,
+           G_PARAM_READWRITE);
+       break;
+     case FLUID_STR_TYPE:
+-      defstr = fluid_settings_getstr_default (bag->settings, name);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
++      fluid_settings_getstr_default (bag->settings, name);
++#else
++      if (fluid_settings_getstr_default (bag->settings, name,&defstr) != FLUID_OK) defstr = 0;
++#endif
+       spec = g_param_spec_string (name, name, name, defstr, G_PARAM_READWRITE);
+       break;
+     case FLUID_SET_TYPE:
+@@ -724,7 +760,11 @@ gstbt_fluid_synth_init (GstBtFluidSynth * src)
+       new_fluid_midi_router (src->settings,
+       fluid_synth_handle_midi_event, src->fluid);
+   if (src->midi_router) {
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+     src->cmd_handler = new_fluid_cmd_handler (src->fluid);
++#else
++    src->cmd_handler = new_fluid_cmd_handler (src->fluid,NULL);
++#endif
+     if (src->cmd_handler) {
+       src->midi = new_fluid_midi_driver (src->settings,
+           fluid_midi_router_handle_midi_event, (void *) (src->midi_router));
+@@ -886,7 +926,7 @@ gstbt_fluid_synth_class_init (GstBtFluidSynthClass * klass)
+       g_param_spec_enum ("chorus-waveform", "Chorus waveform",
+           "Chorus waveform type",
+           CHORUS_WAVEFORM_TYPE,
+-          FLUID_CHORUS_DEFAULT_TYPE,
++          FLUID_CHORUS_MOD_SINE,
+           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ 
+   gst_element_class_set_static_metadata (element_class,
diff --git a/0011-fix-udevadm-path.patch b/0011-fix-udevadm-path.patch
new file mode 100644
index 000000000000..32ec3e38f9d4
--- /dev/null
+++ b/0011-fix-udevadm-path.patch
@@ -0,0 +1,22 @@
+From f93e2617972d4e41cb916c2d7c1542b052f71ecd Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 20 Jun 2017 16:19:42 +0200
+Subject: [PATCH] guvev-discoverer: don't hardcode udevadm location in comment
+
+---
+ src/lib/ic/gudev-discoverer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/ic/gudev-discoverer.c b/src/lib/ic/gudev-discoverer.c
+index fb6e8ebcc..514507caa 100644
+--- a/src/lib/ic/gudev-discoverer.c
++++ b/src/lib/ic/gudev-discoverer.c
+@@ -115,7 +115,7 @@ on_uevent (GUdevClient * client, gchar * action, GUdevDevice * udevice,
+       devnode = g_strdup (devnode);
+ 
+     /* dump properties, also available as:
+-     * /sbin/udevadm info -qall -p /sys/class/sound/card0
++     * $(which udevadm) info -qall -p /sys/class/sound/card0
+      *
+      const gchar* const *props=g_udev_device_get_property_keys(udevice);
+      while(*props) {
diff --git a/PKGBUILD b/PKGBUILD
index 52cf4da868fc..0f89f6991ac3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,75 @@
 
 pkgname=buzztrax
 pkgver=0.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular music composer for Linux"
 arch=('x86_64')
-url="http://buzztrax.org/"
-license=('GPL' 'FDL')
-depends=('clutter-gtk' 'fluidsynth' 'gst-plugins-base-libs' 'libgsf')
+url="https://www.buzztrax.org/"
+license=('LGPL-2.1-or-later' 'GFDL-1.1-or-later')
+depends=('clutter-gtk' 'gst-plugins-base-libs' 'libgsf')
 makedepends=('fluidsynth' 'gobject-introspection' 'intltool' 'rarian' 'gtk-doc')
 replaces=('buzztard')
-optdepends=('gst-plugins-ugly: for the use of mp3 recording'
-            'gst-plugins-bad: extra audio effects'
-            'fluidsynth: to build a relates gstreamer wrapper')
-source=("http://files.buzztrax.org/releases/buzztrax-$pkgver.tar.gz"
-        "0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch")
-sha256sums=('675ed744cd5209dda11e1d2fcd621d6ca23bf2eac89230bbd39242fe5f4000ed'
-            '7866edce48a9b7375ae0c38b9dc8565ecac80dc8ad31e772a8d178f487f8f136')
+optdepends=(
+    'gst-plugins-ugly: for the use of mp3 recording'
+    'gst-plugins-bad: extra audio effects'
+    'fluidsynth: to build a relates gstreamer wrapper'
+)
+_tag=RELEASE_$(sed 's|\.|_|g' <<< $pkgver)
+source=(
+    "https://github.com/Buzztrax/buzztrax/releases/download/$_tag/$pkgname-$pkgver.tar.gz"
+    "0001-about-dialog-take-release-year-and-release-date-from.patch"
+    "0002-build-Fix-32-bit-bml-build.patch"
+    "0003-configure-add-msee-when-using-xmmintin.h.patch"
+    "0004-configure-fix-the-header-name-mess.patch"
+    "0005-bt-dec-rename-plugin.patch"
+    "0006-gtk-update-icon-cache.patch"
+    "0007-add-gobject-casts.patch"
+    "0008-replace-deprecated-fluid_settings_getstr.patch"
+    "0009-replace-deprecated-fluid_synth_set_midi_router.patch"
+    "0010-fix-build-fluidsynth-2.patch"
+    "0011-fix-udevadm-path.patch"
+)
+sha256sums=(
+    'd90b92f822902a9b3f51572d63d5d779bf592e9af3b27bbf899d373e74f8e3bb'
+    '9e899afb9e596abffa90f4bb1062e82e0737fef0bac4eb4ce2ee5ed9e2551cae'
+    '88a492689533b31cf95415496a5030db0554f337bf51c62e427090b4f708a2ce'
+    'cd21a197839544335d6bc85941f9d9b4ec23a9aefaf69d38d6b7ae7a5b9c29b8'
+    '60c7b6b74664572f1a45d39cce685791674297d55d6b7b20810e4547583d6620'
+    '03d498940515370d0b575e403ea06f67778516053a339f7ddbc4602e534771d0'
+    '37492f89792d7a914485fe0dbfc8354d65b0244bbc865929151c6b2ecbe6cb0a'
+    'c2bf1fc8713c66c506992b5a26bc083dd380dab4b7ee99741b836e487de6ff8c'
+    'dbf858de8747e6e63cff8e7babb2fb2442eb74bddf432063bc6b8d54ca282698'
+    'ed2652eb90b03573f7cd81149915bf3e3f9694446eb53ad198ff64e52ba50f75'
+    '334a43fcf82d6f756bfc93bcf9aab4a3d89901421808402556dd188edfe801f2'
+    'ee2fe8f27709c846ddfe9800e3760bb47fd7c9ad30f999622d930a11d28171af'
+)
 
 prepare() {
-    cd "$pkgname-$pkgver"
-    patch -p1 -i "$srcdir/0001-tests-prefer-AM_TESTS_ENVIRONMENT-to-make-automake-h.patch"
-    sed -i 's/gtk-update-icon-cache-3.0/gtk-update-icon-cache/' configure.ac
-    autoreconf
+    cd $pkgname-$_tag
+    
+    # Apply all patches listed in source array
+    for _patchfile in "$srcdir"/*.patch; do
+        echo "Applying $(basename $_patchfile) ..."
+        patch -p1 -i "$_patchfile"
+    done
+
+    # AUTHORS fails to be generated from .git/index because is a tarball
+    touch AUTHORS
+    # Generate configure script
+    ./autogen.sh --noconfigure --nocheck
 }
 
 build() {
-    cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr --enable-man --enable-gtk-doc \
-                --disable-update-{mime,desktop,icon-cache}
+    cd $pkgname-$_tag
+    ./configure \
+        --prefix=/usr \
+        --enable-man \
+        --disable-silent-rules \
+        --disable-update-{mime,desktop,icon-cache}
     make
 }
 
 package() {
-    cd "$pkgname-$pkgver"
+    cd $pkgname-$_tag
     make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
 }
diff --git a/fix-distcheck-for-build-from-tarball.patch b/fix-distcheck-for-build-from-tarball.patch
new file mode 100644
index 000000000000..17cb5506a02e
--- /dev/null
+++ b/fix-distcheck-for-build-from-tarball.patch
@@ -0,0 +1,24 @@
+From f590465568510a1d595d5b472c8c413b29b168b4 Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Sun, 10 May 2015 17:08:58 +0200
+Subject: [PATCH] Makefile: fix distcheck for build from tarball
+
+When we build from tarball, we don't have the gitdir. Use the included AUTHORS file then.
+---
+ Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2eb9ff295..6891df25d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -157,7 +157,8 @@ distuninstallcheck_listfiles += | grep -v 'mimeinfo.cache'
+ builddirs:
+ 	$(AM_V_at)$(MKDIR_P) src/lib/core/songio/bsl/ src/ui/edit
+ 
+-AUTHORS: $(top_srcdir)/.git/index
++# meh, if we build from a tarball, there won't be a .git/index
++AUTHORS: $(wildcard $(top_srcdir)/.git/index)
+ 	$(AM_V_GEN)if test -d "$(top_srcdir)/.git"; \
+ 	then \
+ 		( cd "$(top_srcdir)" && \