Accepting request 617489 from multimedia:apps

Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.
Fix gcc8 build failure with -Wno-error=restrict.

OBS-URL: https://build.opensuse.org/request/show/617489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buzztrax?expand=0&rev=10

buzztrax-newfix.patch

@@ -0,0 +1,28 @@
+From: Dave Plater <davejplater@gmail.com>
+Date: 2018-06-18 12:34:22 +0200
+Subject: Something has changed in Factory
+References: 
+Upstream: to be submitted
+
+Something has changed in Factory to cause the "-" to be outlawed in "name" in:
+GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)
+
+Index: src/gst/dec/bt-dec.c
+===================================================================
+--- src/gst/dec/bt-dec.c.orig	2015-12-29 23:24:20.000000000 +0200
++++ src/gst/dec/bt-dec.c	2018-06-18 10:59:18.702989750 +0200
+@@ -947,12 +947,12 @@ plugin_init (GstPlugin * plugin)
+       bt_dec_type_find, exts, GST_CAPS_ANY, NULL, NULL);
+   g_free (exts);
+ 
+-  return gst_element_register (plugin, "buzztrax-dec", GST_RANK_MARGINAL,
++  return gst_element_register (plugin, "buzztrax_dec", GST_RANK_MARGINAL,
+       BT_TYPE_DEC);
+ }
+ 
+ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+     GST_VERSION_MINOR,
+-    buzztrax - dec,
++    buzztrax_dec,
+     "Buzztrax song renderer",
+     plugin_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.buzztrax.org");

buzztrax.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 18 10:22:38 UTC 2018 - davejplater@gmail.com
+
+- Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch.
+
+-------------------------------------------------------------------
+Mon Jun 11 11:38:06 UTC 2018 - davejplater@gmail.com
+
+- Fix gcc8 build failure with -Wno-error=restrict.
+
 -------------------------------------------------------------------
 Sat Mar 24 06:22:13 UTC 2018 - davejplater@gmail.com
 

buzztrax.spec

@@ -31,7 +31,7 @@ Name:           buzztrax
 Version:        0.10.2
 Release:        0
 Summary:        A music studio inspired by Buzz
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://buzztrax.org
 Source0:        http://files.buzztrax.org/releases/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Patch1:         buzztrax-appdata.patch
 Patch2:         buzztrax-misleading-indentation.patch
 # PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch davepl@gmail.com -- fix gcc 7 duplicate constant errors
 Patch3:         buzztrax-gcc7fix.patch
+Patch4:         buzztrax-newfix.patch
 BuildRequires:  automake >= 1.13
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -206,21 +207,21 @@ This package contains buzztrax plugins
 %patch1
 %patch2
 %patch3
+%patch4
 # Rpmlint complains that COPYING-DOCS is outdated
 cp -v %{SOURCE2} .
 cp -v %{SOURCE1} .
 
 %build
 %if 1 == 0
-%define gcc_version 7
+%define gcc_version 8
-export CC=gcc-7
+export CC=gcc-8
-export CPP=cpp-7
+export CPP=cpp-8
-export CXX=g++-7
+export CXX=g++-8
 %endif
 export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
-%if 0%{?gcc_version} >= 7
+export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict"
-export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types"
+export CXXFLAGS="$CFLAGS"
-%endif
 
 /bin/sh ./autogen.sh --noconfigure
 %configure --disable-static \