From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- .../bristol/files/bristol-0.60.11-cflags.patch | 44 +++++++++++----------- .../files/bristol-0.60.11-dontcompress.patch | 4 +- .../files/bristol-0.60.11-implicit-dec.patch | 4 +- .../files/bristol-0.60.11-rm_alsa-iatomic.h.patch | 1 - 4 files changed, 26 insertions(+), 27 deletions(-) (limited to 'media-sound/bristol/files') diff --git a/media-sound/bristol/files/bristol-0.60.11-cflags.patch b/media-sound/bristol/files/bristol-0.60.11-cflags.patch index ebce6f444fbe..86bedd6c7993 100644 --- a/media-sound/bristol/files/bristol-0.60.11-cflags.patch +++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch @@ -1,5 +1,5 @@ ---- bristol-0.60.11/bin/Makefile.am -+++ bristol-0.60.11/bin/Makefile.am +--- a/bin/Makefile.am ++++ b/bin/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign @@ -9,8 +9,8 @@ #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen bin_PROGRAMS = bristoljackstats ---- bristol-0.60.11/brighton/Makefile.am -+++ bristol-0.60.11/brighton/Makefile.am +--- a/brighton/Makefile.am ++++ b/brighton/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -19,8 +19,8 @@ bin_PROGRAMS = brighton brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg ---- bristol-0.60.11/bristol/Makefile.am -+++ bristol-0.60.11/bristol/Makefile.am +--- a/bristol/Makefile.am ++++ b/bristol/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -29,8 +29,8 @@ bin_PROGRAMS = bristol #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic ---- bristol-0.60.11/libbrighton/Makefile.am -+++ bristol-0.60.11/libbrighton/Makefile.am +--- a/libbrighton/Makefile.am ++++ b/libbrighton/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -39,8 +39,8 @@ noinst_LIBRARIES = libbrighton.a #libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@ ---- bristol-0.60.11/libbrightonC11/Makefile.am -+++ bristol-0.60.11/libbrightonC11/Makefile.am +--- a/libbrightonC11/Makefile.am ++++ b/libbrightonC11/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -49,8 +49,8 @@ #libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ #libC11_la_LIBADD= ---- bristol-0.60.11/libbrightonX11/Makefile.am -+++ bristol-0.60.11/libbrightonX11/Makefile.am +--- a/libbrightonX11/Makefile.am ++++ b/libbrightonX11/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -59,8 +59,8 @@ #libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ #libB11_a_LIBADD= -L/usr/X11R6/lib -lX11 ---- bristol-0.60.11/libbristol/Makefile.am -+++ bristol-0.60.11/libbristol/Makefile.am +--- a/libbristol/Makefile.am ++++ b/libbristol/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -69,8 +69,8 @@ #libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la ---- bristol-0.60.11/libbristolaudio/Makefile.am -+++ bristol-0.60.11/libbristolaudio/Makefile.am +--- a/libbristolaudio/Makefile.am ++++ b/libbristolaudio/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -79,8 +79,8 @@ #libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ #libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ ---- bristol-0.60.11/libbristolic/Makefile.am -+++ bristol-0.60.11/libbristolic/Makefile.am +--- a/libbristolic/Makefile.am ++++ b/libbristolic/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -89,8 +89,8 @@ #libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ noinst_LIBRARIES = libbristolic.a ---- bristol-0.60.11/libbristolmidi/Makefile.am -+++ bristol-0.60.11/libbristolmidi/Makefile.am +--- a/libbristolmidi/Makefile.am ++++ b/libbristolmidi/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign @@ -99,8 +99,8 @@ libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm ---- bristol-0.60.11/libbvg/Makefile.am -+++ bristol-0.60.11/libbvg/Makefile.am +--- a/libbvg/Makefile.am ++++ b/libbvg/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch index 0b7cedc9e29d..dddcb4a45aea 100644 --- a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch +++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch @@ -1,5 +1,5 @@ ---- a/Makefile.am 2012-01-12 18:23:23.000000000 +0100 -+++ b/Makefile.am 2018-10-04 01:22:03.656483227 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -9,9 +9,6 @@ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/ diff --git a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch index 4f3ba054cd9b..93b329f4b5a9 100644 --- a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch +++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch @@ -1,5 +1,5 @@ ---- bristol-0.60.11/bristol/bristolmemorymoog.c -+++ bristol-0.60.11/bristol/bristolmemorymoog.c +--- a/bristol/bristolmemorymoog.c ++++ b/bristol/bristolmemorymoog.c @@ -33,6 +33,7 @@ #include "bristolmemorymoog.h" diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch index 9d11b4f7d99b..3ac88b13ab29 100644 --- a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch +++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch @@ -11,7 +11,6 @@ Reviewed-by: James Cowgill Bug-Debian: https://bugs.debian.org/834180 Forwarded: no Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c -=================================================================== --- a/libbristolaudio/audioEngineJack.c +++ b/libbristolaudio/audioEngineJack.c @@ -38,9 +38,6 @@ -- cgit v1.2.3