pool/buzztrax
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 722310 from home:plater

Browse Source 
Update to git snapshot to remove scrollkeeper dependency.

OBS-URL: https://build.opensuse.org/request/show/722310
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=50
This commit is contained in:
Dave Plater 2019-08-11 11:17:14 +00:00 committed by Git OBS Bridge
parent 18047e0ff2
commit ec78d0ccc4
9 changed files with 44 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buzztrax-0.10.2+git20190809.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:265ba5fe54865f51c9d8310750f5c9f461b64e66d44d8d6a579f60265fc92485
size 3364673

3
buzztrax-0.10.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:675ed744cd5209dda11e1d2fcd621d6ca23bf2eac89230bbd39242fe5f4000ed
size 4121943

17
buzztrax-appdata.patch
View File

@ -1,17 +0,0 @@
Index: buzztrax.appdata.xml.in
===================================================================
--- buzztrax.appdata.xml.in.orig
+++ buzztrax.appdata.xml.in
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Buzztrax team <buzztrax-devel@buzztrax.org> -->
<application>
- <id type="desktop">buzztrax-edit.desktop</id>
- <metadata_license>CC0</metadata_license>
+ <id type="desktop">buzztrax.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL-2.0+</project_license>
+ <name>Buzztrax Music Editor</name>
<_summary>Fully integrated music composer.</_summary>
<description>
<!-- don't translate 'tracker' -->

180
buzztrax-build.patch
View File

@ -1,180 +0,0 @@
Index: Makefile.src.am
===================================================================
--- Makefile.src.am.orig
+++ Makefile.src.am
@@ -112,6 +112,7 @@ libbml_HEADERS = src/lib/bml/bml.h src/l
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)
@@ -356,7 +357,7 @@ libbuzztrax_core_HEADERS = \
src/lib/core/wire.h
# -- songio plugins
-songiodir = ${exec_prefix}/lib/buzztrax-songio
+songiodir = ${libdir}/buzztrax-songio
songio_LTLIBRARIES = libbtbsl.la
libbtbsl_la_LIBADD = \
libbuzztrax-core.la \
@@ -760,7 +761,9 @@ BuzztraxIc-@BT_MAJORMINOR@.gir: $(G_IR_S
BUILT_GIRSOURCES = BuzztraxCore-@BT_MAJORMINOR@.gir BuzztraxIc-@BT_MAJORMINOR@.gir
-girdir = $(datadir)/gir
+# We can't use $(GIRDIR) and $(TYPELIBDIR), since that might using a different
+# prefix
+girdir = $(datadir)/gir-1.0
gir_DATA = $(BUILT_GIRSOURCES)
typelibsdir = $(libdir)/girepository-1.0
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -5,7 +5,7 @@ AC_CANONICAL_TARGET([])
# we can't do -Werror, because
# - we use gnu make extensions
# - we override uninstallcheck var
-AM_INIT_AUTOMAKE([-Wall 1.14 check-news std-options foreign tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([-Wall 1.13 check-news std-options foreign tar-ustar subdir-objects])
AC_CONFIG_SRCDIR([README.md])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR(m4)
@@ -49,8 +49,15 @@ AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST
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
@@ -271,6 +279,9 @@ if test "$enable_dllwrapper" != "no"; th
enable_dllwrapper="yes"
fi
fi
+if test "$enable_dllwrapper" == "no"; then
+ CALLING_MODE=void
+fi
AC_MSG_RESULT($enable_dllwrapper)
if test "$enable_dllwrapper" = "yes"; then
AC_DEFINE(USE_DLLWRAPPER, 1, [Defined if emulation for buzzmachine dlls is enabled])
@@ -530,17 +541,32 @@ AC_CHECK_DECL(sysi86,[
])
dnl check for SSE intrisics
+have_sse_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 sse intrinsics])
+ CFLAGS="-mmmx -msse"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <xmmintrin.h>
+ int main () {
+ _mm_getcsr ();
+ }]])], [
+ AC_MSG_RESULT(yes)
+ have_sse_intrinsics=yes],[
+ AC_MSG_RESULT(no)])
+ CFLAGS="${SAVED_CFLAGS}"
+ ARCH_CFLAGS="-mmmx -msse"
+ ],[])
;;
esac
-
+if test $have_sse_intrinsics = yes ; then
+ AC_DEFINE(USE_X86_SSE, 1, [use x86 SSE compiler intrinsics])
+ ARCH_CFLAGS="-mmmx -msse"
+fi
dnl check for libraries
LT_LIB_M
@@ -585,7 +611,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"
Index: src/lib/core/core.c
===================================================================
--- src/lib/core/core.c.orig
+++ 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_SSE
+#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_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
// _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
Index: src/ui/edit/about-dialog.c
===================================================================
--- src/ui/edit/about-dialog.c.orig
+++ src/ui/edit/about-dialog.c
@@ -68,7 +68,7 @@ bt_about_dialog_init_ui (const BtAboutDi
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;

26
buzztrax-gcc7fix.patch
View File

@ -1,26 +0,0 @@
Index: src/lib/core/machine.c
===================================================================
--- src/lib/core/machine.c.orig 2015-12-29 23:24:20.000000000 +0200
+++ src/lib/core/machine.c 2017-04-02 18:35:45.045240346 +0200
@@ -2687,7 +2687,7 @@ bt_machine_dbg_print_parts (const BtMach
static xmlNodePtr
bt_machine_persistence_save (const BtPersistence * const persistence,
- const xmlNodePtr const parent_node)
+ const xmlNodePtr parent_node)
{
const BtMachine *const self = BT_MACHINE (persistence);
GstObject *machine;
Index: src/lib/core/wave.c
===================================================================
--- src/lib/core/wave.c.orig 2015-08-16 14:21:45.000000000 +0200
+++ src/lib/core/wave.c 2017-04-02 18:42:45.757608888 +0200
@@ -650,7 +650,7 @@ bt_wave_get_level_by_index (const BtWave
static xmlNodePtr
bt_wave_persistence_save (const BtPersistence * const persistence,
- const xmlNodePtr const parent_node)
+ const xmlNodePtr parent_node)
{
const BtWave *const self = BT_WAVE (persistence);
xmlNodePtr node = NULL;

139
buzztrax-misleading-indentation.patch
View File

@ -1,139 +0,0 @@
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))) {

28
buzztrax-newfix.patch
View File

@ -1,28 +0,0 @@
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");

13
buzztrax.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Aug 11 08:14:05 UTC 2019 - Dave Plater <davejplater@gmail.com>
- Update to git snapshot version 0.10.2+git20190809 which no longer
uses rarian-scrollkeeper but uses yelp instead for help file
generation.
- This fixes boo#1141385.
- Removed the following incorporated patches:
buzztrax-appdata.patch, buzztrax-build.patch,
buzztrax-gcc7fix.patch, buzztrax-misleading-indentation.patch
and buzztrax-newfix.patch.
- Added -Wno-error=format for the i586 build.
-------------------------------------------------------------------
Wed Jul 10 12:25:54 UTC 2019 - Dave Plater <davejplater@gmail.com>

58
buzztrax.spec
View File

@ -16,6 +16,9 @@
#
%define rev eb51b04c45f075577f71199d3a62c8fc6c5996f2
%define relver 0.11.0
%define gir gobject-introspection-1.0
%define gstreamer_pluginsdir %(pkg-config --variable=pluginsdir gstreamer-1.0)
%define girdir %{_datadir}/gir-1.0
@ -28,43 +31,33 @@
%define glib_version 2.32.0
%define gst_version 1.2.0
Name: buzztrax
Version: 0.10.2
Version: 0.10.2+git20190809
Release: 0
Summary: A music studio inspired by Buzz
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
Source0: https://github.com/Buzztrax/buzztrax/archive//%{rev}.tar.gz#/%{name}-%{version}.tar.gz
#http://files.buzztrax.org/releases/%%{name}-%%{version}.tar.gz
Source1: autogen.sh
Source2: COPYING-DOCS
# 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
# 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
%if 0%{?suse_version} > 1320
BuildRequires: gcc-c++
%else
BuildRequires: gcc8-c++
%endif
BuildRequires: gtk-doc
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: scrollkeeper
BuildRequires: shared-mime-info
BuildRequires: pkgconfig(%{gir})
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(clutter-gtk-1.0)
#BuildRequires: pkgconfig(fluidsynth)
BuildRequires: yelp-devel
BuildRequires: yelp-tools
BuildRequires: pkgconfig(gdk-x11-3.0)
BuildRequires: pkgconfig(gio-2.0) >= %{glib_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib_version}
@ -197,6 +190,10 @@ This package provides the development files for libbml.
Summary: Buzztrax plugins
Group: Productivity/Multimedia/Other
Requires: buzztrax = %{version}
Requires: libbml%{bml_soname} = %{version}
Requires: libbuzztrax-core%{core_soname} = %{version}
Requires: libbuzztrax-gst%{gst_soname} = %{version}
Requires: libbuzztrax-ic%{ic_soname} = %{version}
%description plugins
This package contains buzztrax plugins
@ -204,21 +201,23 @@ This package contains buzztrax plugins
%lang_package
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3
%patch4
%setup -q -n %{name}-%{rev}
%autopatch -p1
# Rpmlint complains that COPYING-DOCS is outdated
cp -v %{SOURCE2} .
cp -v %{SOURCE1} .
if ! `test -a AUTHORS`; then
touch AUTHORS
fi
%build
test -x "$(type -p gcc-8)" && export CC="$_"
test -x "$(type -p g++-8)" && export CXX="$_"
export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict"
%ifarch i586
export CFLAGS="$CFLAGS -Wno-error=format"
%endif
export CXXFLAGS="$CFLAGS"
/bin/sh ./autogen.sh --noconfigure
@ -230,7 +229,9 @@ export CXXFLAGS="$CFLAGS"
--disable-rpath \
--with-pic \
--enable-man \
--disable-dllwrapper
--disable-dllwrapper \
--enable-gtk-doc
cp -v docs/version.entities docs/help/bt-edit/C/
make %{?_smp_mflags}
@ -238,14 +239,14 @@ make %{?_smp_mflags}
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
echo %{buildroot}
%find_lang %{name}-%{version}
%find_lang %{name}-%{relver}
mv %{buildroot}%{_datadir}/applications/buzztrax-edit.desktop %{buildroot}%{_datadir}/applications/buzztrax.desktop
#%%find_gconf_schemas
# ensure the icons in hicolor are the REAL files. fdupes links them the 'wrong way around' for xdg-app and appstream-builder
for icon in 48x48/apps/buzztrax.png scalable/apps/buzztrax.svg; do
ln -sf %{_datadir}/icons/hicolor/${icon} %{buildroot}%{_datadir}/icons/gnome/${icon}
done
%fdupes -s %{buildroot}
%fdupes -s %{buildroot}/%{_datadir}/
# WARNING: this creates baselibs.conf
printf 'libbuzztrax-ic%{ic_soname}\n
libbuzztrax-core%{core_soname}\n
@ -315,11 +316,8 @@ typelib-1_0-BuzztraxCore-1_1\n
%{_datadir}/appdata/buzztrax.appdata.xml
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/gnome
%dir %{_datadir}/omf
%dir %{_datadir}/omf/buzztrax-edit
%doc %{_datadir}/omf/buzztrax-edit/
%dir %{_datadir}/gnome/
%doc %{_datadir}/gnome/help/
%{_datadir}/help/C
%{_mandir}/man1/*
%dir %{_datadir}/gtk-doc/html/buzztrax-cmd
%dir %{_datadir}/gtk-doc/html/buzztrax-edit
%{_datadir}/gtk-doc/html/buzztrax-cmd/
@ -405,7 +403,7 @@ typelib-1_0-BuzztraxCore-1_1\n
%dir %{_libdir}/buzztrax-songio
%{_libdir}/buzztrax-songio/*.so
%files lang -f buzztrax-%{version}.lang
%files lang -f %{name}-%{relver}.lang
%defattr (-, root, root)
%changelog