Hello community,
here is the log from the commit of package buzztrax for openSUSE:Factory
checked in at 2016-07-05 09:51:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/buzztrax (Old)
and /work/SRC/openSUSE:Factory/.buzztrax.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "buzztrax"
Changes:
--------
--- /work/SRC/openSUSE:Factory/buzztrax/buzztrax.changes 2016-06-20
11:07:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.buzztrax.new/buzztrax.changes 2016-07-05
09:51:30.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 28 12:08:14 UTC 2016 - davejpla...@gmail.com
+
+- Removed workaround -Wno-error=misleading-indentation flag and
+ made buzztrax-misleading-indentation.patch from upstream git to
+ fix boo#985062 .
+
+-------------------------------------------------------------------
New:
----
buzztrax-misleading-indentation.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ buzztrax.spec ++++++
--- /var/tmp/diff_new_pack.HJin6J/_old 2016-07-05 09:51:31.000000000 +0200
+++ /var/tmp/diff_new_pack.HJin6J/_new 2016-07-05 09:51:31.000000000 +0200
@@ -40,6 +40,8 @@
# Combined patch of cherry picked build fixes applies after 0.10.2
Patch0: buzztrax-build.patch
Patch1: buzztrax-appdata.patch
+# PATCH-FIX gcc6 error misleading-indentation with patch from git.
+Patch2: buzztrax-misleading-indentation.patch
BuildRequires: automake >= 1.13
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -200,14 +202,12 @@
%setup -q
%patch0
%patch1
+%patch2
# Rpmlint complains that COPYING-DOCS is outdated
cp -v %{SOURCE2} .
cp -v %{SOURCE1} .
%build
-%if 0%{?suse_version} > 1320
-export CFLAGS="-Wno-error=misleading-indentation %{optflags}"
-%endif
/bin/sh ./autogen.sh --noconfigure
%configure --disable-static \
--disable-schemas-compile \
++++++ buzztrax-misleading-indentation.patch ++++++
Index: tests/lib/bml/bmltest_info.h
===================================================================
--- tests/lib/bml/bmltest_info.h.orig
+++ tests/lib/bml/bmltest_info.h
@@ -40,9 +40,15 @@ int bml(test_info(char *libpath)) {
ts2=_get_timestamp();
printf(" machine initialized in %lf sec\n",ts2-ts1);
- if(bml(get_machine_info(bmh,BM_PROP_SHORT_NAME,(void *)&str)))
printf(" Short Name: \"%s\"\n",str);
- if(bml(get_machine_info(bmh,BM_PROP_NAME,(void *)&str)))
printf(" Name: \"%s\"\n",str);
- if(bml(get_machine_info(bmh,BM_PROP_AUTHOR,(void *)&str)))
printf(" Author: \"%s\"\n",str);
+ if(bml(get_machine_info(bmh,BM_PROP_SHORT_NAME,(void *)&str))) {
+ printf(" Short Name: \"%s\"\n",str);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_NAME,(void *)&str))) {
+ printf(" Name: \"%s\"\n",str);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_AUTHOR,(void *)&str))) {
+ printf(" Author: \"%s\"\n",str);
+ }
if(bml(get_machine_info(bmh,BM_PROP_COMMANDS,(void *)&str))) {
if(str) {
char *t=strdup(str), *p=t;
@@ -54,9 +60,14 @@ int bml(test_info(char *libpath)) {
free(t);
}
}
- if(bml(get_machine_info(bmh,BM_PROP_TYPE,(void *)&val)))
printf(" Type: %i -> \"%s\"\n",val,((val<3)?machine_types[val]:"unknown"));
- if(bml(get_machine_info(bmh,BM_PROP_VERSION,(void *)&val)))
printf(" Version: %3.1f\n",(float)val/10.0);
- if(bml(get_machine_info(bmh,BM_PROP_FLAGS,(void *)&val))) {
printf(" Flags: 0x%x\n",val);
+ if(bml(get_machine_info(bmh,BM_PROP_TYPE,(void *)&val))) {
+ printf(" Type: %i ->
\"%s\"\n",val,((val<3)?machine_types[val]:"unknown"));
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_VERSION,(void *)&val))) {
+ printf(" Version: %3.1f\n",(float)val/10.0);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_FLAGS,(void *)&val))) {
+ printf(" Flags: 0x%x\n",val);
if(val&(1<<0)) puts(" MIF_MONO_TO_STEREO");
if(val&(1<<1)) puts(" MIF_PLAYS_WAVES");
if(val&(1<<2)) puts(" MIF_USES_LIB_INTERFACE");
@@ -67,12 +78,21 @@ int bml(test_info(char *libpath)) {
if(val&(1<<7)) puts(" MIF_INTERNAL_AUX");
//if(val&) puts(" ");
}
- if(bml(get_machine_info(bmh,BM_PROP_MIN_TRACKS,(void *)&val)))
printf(" MinTracks: %i\n",val);
+ if(bml(get_machine_info(bmh,BM_PROP_MIN_TRACKS,(void *)&val))) {
+ printf(" MinTracks: %i\n",val);
+ }
tracks=val;
- if(bml(get_machine_info(bmh,BM_PROP_MAX_TRACKS,(void *)&val)))
printf(" MaxTracks: %i\n",val);
- if(bml(get_machine_info(bmh,BM_PROP_NUM_INPUT_CHANNELS,(void *)&val)))
printf(" InputChannels: %d\n",val);
- if(bml(get_machine_info(bmh,BM_PROP_NUM_OUTPUT_CHANNELS,(void *)&val)))
printf(" OutputChannels: %d\n",val);fflush(stdout);
- if(bml(get_machine_info(bmh,BM_PROP_NUM_GLOBAL_PARAMS,(void *)&val))) {
printf(" NumGlobalParams: %i\n",val);fflush(stdout);
+ if(bml(get_machine_info(bmh,BM_PROP_MAX_TRACKS,(void *)&val))) {
+ printf(" MaxTracks: %i\n",val);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_NUM_INPUT_CHANNELS,(void *)&val))) {
+ printf(" InputChannels: %d\n",val);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_NUM_OUTPUT_CHANNELS,(void *)&val))) {
+ printf(" OutputChannels: %d\n",val);fflush(stdout);
+ }
+ if(bml(get_machine_info(bmh,BM_PROP_NUM_GLOBAL_PARAMS,(void *)&val))) {
+ printf(" NumGlobalParams: %i\n",val);fflush(stdout);
num=val;numtrig=0;
for(i=0;i<num;i++)
if(bml(get_global_parameter_info(bmh,i,BM_PARA_FLAGS,(void *)&val)))
@@ -80,10 +100,17 @@ int bml(test_info(char *libpath)) {
printf(" NumGlobalTriggerParams: %i\n",numtrig);fflush(stdout);
for(i=0;i<num;i++) {
printf(" GlobalParam=%02i\n",i);
- if(bml(get_global_parameter_info(bmh,i,BM_PARA_TYPE,(void *)&type)))
printf(" Type: %i ->
\"%s\"\n",type,((type<4)?parameter_types[type]:"unknown"));
- if(bml(get_global_parameter_info(bmh,i,BM_PARA_NAME,(void *)&str)))
printf(" Name: \"%s\"\n",str);
- if(bml(get_global_parameter_info(bmh,i,BM_PARA_DESCRIPTION,(void
*)&str))) printf(" Description: \"%s\"\n",str);
- if(bml(get_global_parameter_info(bmh,i,BM_PARA_FLAGS,(void *)&val)))
{ printf(" Flags: 0x%x\n",val);
+ if(bml(get_global_parameter_info(bmh,i,BM_PARA_TYPE,(void *)&type)))
{
+ printf(" Type: %i ->
\"%s\"\n",type,((type<4)?parameter_types[type]:"unknown"));
+ }
+ if(bml(get_global_parameter_info(bmh,i,BM_PARA_NAME,(void *)&str))) {
+ printf(" Name: \"%s\"\n",str);
+ }
+ if(bml(get_global_parameter_info(bmh,i,BM_PARA_DESCRIPTION,(void
*)&str))) {
+ printf(" Description: \"%s\"\n",str);
+ }
+ if(bml(get_global_parameter_info(bmh,i,BM_PARA_FLAGS,(void *)&val)))
{
+ printf(" Flags: 0x%x\n",val);
if(val&(1<<0)) puts(" MPF_WAVE");
if(val&(1<<1)) puts(" MPF_STATE");
if(val&(1<<2)) puts(" MPF_TICK_ON_EDIT");
@@ -104,7 +131,8 @@ int bml(test_info(char *libpath)) {
puts(" NumGlobalTriggerParams: 0");
}
fflush(stdout);
- if(bml(get_machine_info(bmh,BM_PROP_NUM_TRACK_PARAMS,(void *)&val))) {
printf(" NumTrackParams: %i\n",val);fflush(stdout);
+ if(bml(get_machine_info(bmh,BM_PROP_NUM_TRACK_PARAMS,(void *)&val))) {
+ printf(" NumTrackParams: %i\n",val);fflush(stdout);
num=val;numtrig=0;
for(i=0;i<num;i++)
if(bml(get_track_parameter_info(bmh,i,BM_PARA_FLAGS,(void *)&val)))
@@ -113,10 +141,17 @@ int bml(test_info(char *libpath)) {
if(num && tracks) {
for(i=0;i<num;i++) {
printf(" TrackParam=%02i\n",i);
- if(bml(get_track_parameter_info(bmh,i,BM_PARA_TYPE,(void
*)&type))) printf(" Type: %i ->
\"%s\"\n",type,((type<4)?parameter_types[type]:"unknown"));
- if(bml(get_track_parameter_info(bmh,i,BM_PARA_NAME,(void *)&str)))
printf(" Name: \"%s\"\n",str);
- if(bml(get_track_parameter_info(bmh,i,BM_PARA_DESCRIPTION,(void
*)&str))) printf(" Description: \"%s\"\n",str);
- if(bml(get_track_parameter_info(bmh,i,BM_PARA_FLAGS,(void
*)&val))) { printf(" Flags: 0x%x\n",val);
+ if(bml(get_track_parameter_info(bmh,i,BM_PARA_TYPE,(void
*)&type))) {
+ printf(" Type: %i ->
\"%s\"\n",type,((type<4)?parameter_types[type]:"unknown"));
+ }
+ if(bml(get_track_parameter_info(bmh,i,BM_PARA_NAME,(void *)&str)))
{
+ printf(" Name: \"%s\"\n",str);
+ }
+ if(bml(get_track_parameter_info(bmh,i,BM_PARA_DESCRIPTION,(void
*)&str))) {
+ printf(" Description: \"%s\"\n",str);
+ }
+ if(bml(get_track_parameter_info(bmh,i,BM_PARA_FLAGS,(void
*)&val))) {
+ printf(" Flags: 0x%x\n",val);
if(val&(1<<0)) puts(" MPF_WAVE");
if(val&(1<<1)) puts(" MPF_STATE");
if(val&(1<<2)) puts(" MPF_TICK_ON_EDIT");
@@ -143,11 +178,14 @@ int bml(test_info(char *libpath)) {
puts(" NumTrackTriggerParams: 0");
}
fflush(stdout);
- if(bml(get_machine_info(bmh,BM_PROP_NUM_ATTRIBUTES,(void *)&val))) {
printf(" NumAttributes: %i\n",val);fflush(stdout);
+ if(bml(get_machine_info(bmh,BM_PROP_NUM_ATTRIBUTES,(void *)&val))) {
+ printf(" NumAttributes: %i\n",val);fflush(stdout);
num=val;
for(i=0;i<num;i++) {
printf(" Attribute=%02i\n",i);
- if(bml(get_attribute_info(bmh,i,BM_ATTR_NAME,(void *)&str)))
printf(" Name: \"%s\"\n",str);
+ if(bml(get_attribute_info(bmh,i,BM_ATTR_NAME,(void *)&str))) {
+ printf(" Name: \"%s\"\n",str);
+ }
if(bml(get_attribute_info(bmh,i,BM_ATTR_MIN_VALUE,(void *)&mival)) &&
bml(get_attribute_info(bmh,i,BM_ATTR_MAX_VALUE,(void *)&maval)) &&
bml(get_attribute_info(bmh,i,BM_ATTR_DEF_VALUE,(void *)&val))) {
