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

Accepting request 352555 from home:plater

Browse Source 
Reduced automake requirement from >+ 1.14 to 1.13

OBS-URL: https://build.opensuse.org/request/show/352555
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=13
This commit is contained in:
Dave Plater 2016-01-08 10:36:36 +00:00 committed by Git OBS Bridge
parent 507ade2408
commit 00beca38a1
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
buzztrax-build.patch
View File

@ -1,8 +1,8 @@
diff --git a/Makefile.src.am b/Makefile.src.am
index aee876c..fe4bb62 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
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 \
@ -19,7 +19,7 @@ index aee876c..fe4bb62 100644
songio_LTLIBRARIES = libbtbsl.la
libbtbsl_la_LIBADD = \
libbuzztrax-core.la \
@@ -760,7 +761,9 @@ BuzztraxIc-@BT_MAJORMINOR@.gir: $(G_IR_SCANNER) libbuzztrax-ic.la
@@ -760,7 +761,9 @@ BuzztraxIc-@BT_MAJORMINOR@.gir: $(G_IR_S
BUILT_GIRSOURCES = BuzztraxCore-@BT_MAJORMINOR@.gir BuzztraxIc-@BT_MAJORMINOR@.gir
@ -30,11 +30,20 @@ index aee876c..fe4bb62 100644
gir_DATA = $(BUILT_GIRSOURCES)
typelibsdir = $(libdir)/girepository-1.0
diff --git a/configure.ac b/configure.ac
index cd08e3f..c2181ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,15 @@ AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR", [gstreamer series])
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
@ -60,7 +69,7 @@ index cd08e3f..c2181ca 100644
dnl Checks for programs.
AC_PROG_CC
@@ -271,6 +279,9 @@ if test "$enable_dllwrapper" != "no"; then
@@ -271,6 +279,9 @@ if test "$enable_dllwrapper" != "no"; th
enable_dllwrapper="yes"
fi
fi
@ -118,10 +127,10 @@ index cd08e3f..c2181ca 100644
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..3742cb5 100644
--- a/src/lib/core/core.c
+++ b/src/lib/core/core.c
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
@ -156,11 +165,11 @@ index 6a03d5e..3742cb5 100644
_mm_setcsr (_mm_getcsr () | 0x8040); // set DAZ and FZ bits
#endif
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)
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"),