Version bump, drop pulseaudio use flag since it's not fully supported (bug #424848).

Package-Manager: portage-2.2.0_alpha165/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 198 insertions, 17 deletions

diff --git a/media-sound/bristol/ChangeLog b/media-sound/bristol/ChangeLog
index 06d4b2a2047b..69ad97d1771b 100644
--- a/media-sound/bristol/ChangeLog
+++ b/media-sound/bristol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/bristol
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.14 2012/06/30 05:54:41 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.15 2013/03/09 21:42:48 radhermit Exp $
+
+*bristol-0.60.11 (09 Mar 2013)
+
+  09 Mar 2013; Tim Harder <radhermit@gentoo.org> +bristol-0.60.11.ebuild,
+  +files/bristol-0.60.11-cflags.patch,
+  +files/bristol-0.60.11-implicit-dec.patch:
+  Version bump, drop pulseaudio use flag since it's not fully supported (bug
+  #424848).
 
 *bristol-0.60.10 (30 Jun 2012)
 
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 261487e0d391..81ceb8bf5fac 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX bristol-0.60.9-cflags.patch 553 RMD160 3d1cf412332ff3bd2a2b36a89d8088eada80d0fc SHA1 b28136d4935d9e3ff81305d7900e5dc59e9e0080 SHA256 1ea85c533865fe71147b7438b9e96a032d12309d06e0886bd6bf6fa8eb55eef0
-DIST bristol-0.60.10.tar.gz 4206356 RMD160 6de9b9def5d23aa4e73c9f7513e96a40214fa585 SHA1 b2b93a675fb1432f6a1b939729480ab42994d923 SHA256 a39cee4d7d59422b67a55620ae17f5b4aff162bf39077e70c5799bde7eb1191c
-DIST bristol-0.60.9.tar.gz 4323706 RMD160 c0e339ea363e7bf58b3f7217c9343ed76abbd878 SHA1 ff3163347d68ca35f0040076f1d1e4ba4cd7f3e9 SHA256 0f3e67a18ffeaadd0600facdb4e10437c855fd078ce26292f6f905aa96cd6cf6
-EBUILD bristol-0.60.10.ebuild 1206 RMD160 852864ef0e3b1390bbf4e8293f4bcd2a58ee0fa0 SHA1 7d134b414825c4d628e0abeec84fefad288c61cb SHA256 9579da2281d60e6e3b36152310c4f58d39593d2fe9249aa4e7b2fa2969f7a871
-EBUILD bristol-0.60.9.ebuild 1137 RMD160 f15ef255506058acb6475d1155f87683fc739fc8 SHA1 afa5fc5ebac5d78bed215f1b0c7918221426afe6 SHA256 4f4f0232b8575e6b0bc3f3ae96cdaf480836d5954d51f150d4a87c044f05a175
-MISC ChangeLog 2369 RMD160 bf3cb8087dbe29966dc5c53fa899ea594d876c27 SHA1 0e72ad62128487362d5320aee850dfdfda2089ef SHA256 096c801ca97005c75280ff23c4ecf9ee50a0a0cab86619b359e69f5480137a32
-MISC metadata.xml 426 RMD160 fb74ca8dcc43bc8f18a1aec06ece5e52d4a88c79 SHA1 0d0da5f955d037c7d2b51d6654e0ae780f3e43b3 SHA256 791aae49a8691dcd05c8d810785eb32b98e8fbae8689b1c66b32d3d838fd5ea5
+AUX bristol-0.60.11-cflags.patch 7046 SHA256 d1314d1ee4609eb4526917e8da37edba484c670b1aff953f6ca08126f90f35d9 SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e WHIRLPOOL 0b4285cf878891bf9a3a08d4e3509e68e2513dc3dcb6775da2c0cf957201658c81876431a2caf3088a113e9d1f9c7eae10ce827619866669f78b161415b99aa3
+AUX bristol-0.60.11-implicit-dec.patch 320 SHA256 435bd056aebe46075b001fd4b47627008b33e09a4dbb4a167564e5df8ca15161 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341 WHIRLPOOL d9050f9ee39c215d5263ed2bdf654eea416947e6d4222c06e322e7168215e50c974c8b2c5cf6903efb2d103f04c2edbc42bfaeedbf403f0aa4a9f5995d9b0b54
+AUX bristol-0.60.9-cflags.patch 553 SHA256 1ea85c533865fe71147b7438b9e96a032d12309d06e0886bd6bf6fa8eb55eef0 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3 WHIRLPOOL d10632ee0d2274247d87767cf4077dc2bafa9c89301c96cb4e2f64a46303b2391ec13f195dc857d15874b2cee811008965a70c9e44eafe51cba3a5ef366839cf
+DIST bristol-0.60.10.tar.gz 4206356 SHA256 a39cee4d7d59422b67a55620ae17f5b4aff162bf39077e70c5799bde7eb1191c SHA512 f5a823f21f5d6459342f50831e14a8d21720a3e96022ec5e5378a8c88cfa4d51aefed330ca90d4811e9fb251a7be0ec4cb62b90ccdbf8f974b4715baa50f9c37 WHIRLPOOL 98e34c8a8fccc892ca95a3d76d7dea648eac223469b8a624e3daffeb19f4a9428c10c4cf36b9b74654e4f8d7c0babe9271d10e992b7d2f810cb87bd8c4f3a332
+DIST bristol-0.60.11.tar.gz 4218697 SHA256 7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180 WHIRLPOOL dee8b8937b36747426bde32c5d027e44dd1d0b7791997e130122b4bad0abfb31c4957983610086b64e358963fbf78b4e2014af1105c1300dc8deec14e669d2bf
+DIST bristol-0.60.9.tar.gz 4323706 SHA256 0f3e67a18ffeaadd0600facdb4e10437c855fd078ce26292f6f905aa96cd6cf6 SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff WHIRLPOOL 0454f205a7cbe5c652d7b4ba006081a8c23186e7b4144259c34bc6f979409207619f7ce709857abac9751a527cbfda1d61e9a07dd3432646ab0f135560823cfb
+EBUILD bristol-0.60.10.ebuild 1206 SHA256 9579da2281d60e6e3b36152310c4f58d39593d2fe9249aa4e7b2fa2969f7a871 SHA512 1a11b9fcce5d1d4614a55aa4121db980d7b1fec922b4a3abb41dc95f63d0e92449abc68d870090046916c5f08040b924c2e0d9f2a12e0bcc95a69e72382f1085 WHIRLPOOL 91eb06745b683cb105db352af252b6a7a946d9873e396c3619801a65f80e5c4d5fc37d5579aade8727446cd28941e8fb556f922332c8333dc2e462b437cc0d3c
+EBUILD bristol-0.60.11.ebuild 1196 SHA256 f311d5c1edbca60300f258e77249cfc1b4d706e88e154176bf6f91599db1b3d4 SHA512 4e083125c4bbb68011a2d9fee3aeee2d333ac4a081d5a611e1a78334252791ef20bbf3602e724483c14ab3742b09a507e887e47d436550fa370102d3ee3be94a WHIRLPOOL 271b194337f1ae031e16f870fe81a19041d63339a44a54cd89cc9caadc26470445e93a7f7b3eae69472bacccf3fd35fa005c30cc3bebef4d1e1a2b1291c4b0a9
+EBUILD bristol-0.60.9.ebuild 1137 SHA256 4f4f0232b8575e6b0bc3f3ae96cdaf480836d5954d51f150d4a87c044f05a175 SHA512 e4edb55050035f89d1bd22d09e091bbc735019e931cfc9bd82119e3a77c1f06cb7c36ed08f7e5c46d833160a53e6b5d56943787c99d7bb8a6d73998027c3e178 WHIRLPOOL aa2e6509609d9a1d7169d9b8c0f7ebb723d3c4fd68d454074201e2c80b3b00ddc63b5b7cd347f0423247d50039a1cab0da5d2abfff1ad4cf87fe19d847eb15af
+MISC ChangeLog 2649 SHA256 129141dfa84dc1ba243c3d41b3eeba3b1edb22002ad8c02fea83982705530982 SHA512 68d4832a6cd3e7ae40262aa97de4204827e0e1d410f95c7c0aa886b18e41d8a882f1aa5ce492303768e20876179f4b4f8c5f8213abdff787181a14e75a80eded WHIRLPOOL 86c5ffb7f392f2443a2122b3c9bbec32ab51b600e94befd21a6b8f77c123d5fc74723195aaed63659090d537301ca3c920629312cc05ebb2a2f04647e067b2e2
+MISC metadata.xml 426 SHA256 791aae49a8691dcd05c8d810785eb32b98e8fbae8689b1c66b32d3d838fd5ea5 SHA512 84fddc9f53ffa949739e973129ef343cb6463016a1685fd5b4380743fd8abe1bffd01491ee703811fd724807520e0a82066fefb5bad58820f8da3daa1db65d73 WHIRLPOOL ec86d26ea6d93b3062a002b09e7546a2127e42b3a827e72a84005bc6fac8eb83eb532550eb33fa06e9f1663af5a94718656cd824795682cc0f67597a7820c4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP7pSnAAoJEEqz6FtPBkyjmIIH/izXJ2XXFrNcWg82QqLL0M/z
-9Z+oarzdgnRr002cxY6zt1E5Qd1un08DNgKqs2q1ivPSpoNvNW8M4oS4byT5q1C5
-mwLRuOTtAjw84/s2CI/pjeyftC61a9tnZHZq4XvV0QybL6DKdAs0rMGFG/IifKqM
-6vWlXQ+UAiJzLx7p12vJesI+LlZrwShyB/Mo8ThMlPeyxnnrtStzN4r4SyH+XWhn
-TQaD4u5mdIzISdSOyGTfaC4RKQaVBeq1KkMzdOJAX1kjsAtBUgi4dORu8ePQiAvu
-U3ya8AlOsjHpdiQ52zPqUuigtmUmUWMzQPFKe1AxSqsmtsPmbVCZGWtXQ0eSQVo=
-=LxxJ
+iQEcBAEBCAAGBQJRO6zZAAoJEEqz6FtPBkyjuGIH/1SEoE8EpT9TLkkwIFrO3AOK
+DSf3No6D6YtMHAy06HhBX3suYhkb42vPI7UHPfCXt4JuNhs6ast0jea+0h8BElOg
+Q7AaNEewPY1e+xYzeizoE+eazBSruELeFKJlpIPVrJBknTrSyVCzi3BbDvT1Mp41
+4fTUA1qgmiPoCW71ti1+zzKKM99BaFTCOvyYIKPmTrR1z3h9TdzMS6x7YsqXZTBR
+bFlgthQ6yg5QLMeUO6avS9ksX7aUFvx9fuYETcelf1+Ige0DsZi+qciyxqZ4FM1x
++rXcAnjVbrL7Zs1eR/9zOrPR0IBkCeL1PDjOJ5VSTaCu45T8n/GUyOwlOOOTbPM=
+=cQRC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild
new file mode 100644
index 000000000000..6c5973398273
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/bristol-0.60.11.ebuild,v 1.1 2013/03/09 21:42:48 radhermit Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="http://sourceforge.net/projects/bristol"
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss static-libs"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	x11-libs/libX11"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-implicit-dec.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-version-check \
+		$(use_enable oss) \
+		$(use_enable alsa)
+}
+
+src_install() {
+	default
+	prune_libtool_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
new file mode 100644
index 000000000000..ebce6f444fbe
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
@@ -0,0 +1,111 @@
+--- bristol-0.60.11/bin/Makefile.am
++++ bristol-0.60.11/bin/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ LDFLAGS = -Bdynamic -lm -lpthread `pkg-config --silence-errors --libs jack`
+-AM_CFLAGS = -pthread -Wall -g -I. -I$(srcdir)/../include/bristol @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @JACK_CFLAGS@
++AM_CFLAGS = -pthread -Wall -I. -I$(srcdir)/../include/bristol @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @JACK_CFLAGS@
+ 
+ #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
+ bin_PROGRAMS = bristoljackstats
+--- bristol-0.60.11/brighton/Makefile.am
++++ bristol-0.60.11/brighton/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@
+ 
+ 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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -msse -mfpmath=sse -ffast-math -fomit-frame-pointer -O2
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@
+ 
+ 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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
+ 
+ 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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton @BRIGHTON_HAS_XIMAGE@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton @BRIGHTON_HAS_XIMAGE@
+ 
+ #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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ @BRIGHTON_HAS_SHMIMAGE@ @BRIGHTON_HAS_X11@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ @BRIGHTON_HAS_SHMIMAGE@ @BRIGHTON_HAS_X11@
+ 
+ #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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
+ #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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_OSS=@BRISTOL_HAS_OSS@ @BRISTOL_HAS_DRAIN@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_PA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_OSS=@BRISTOL_HAS_OSS@ @BRISTOL_HAS_DRAIN@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_PA@
+ 
+ #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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/bristol -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
+ #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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ -O1
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ -O1
+ 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
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
+ 
+ noinst_LIBRARIES = libbvg.a
+ #libbvg_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
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
new file mode 100644
index 000000000000..4f3ba054cd9b
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
@@ -0,0 +1,10 @@
+--- bristol-0.60.11/bristol/bristolmemorymoog.c
++++ bristol-0.60.11/bristol/bristolmemorymoog.c
+@@ -33,6 +33,7 @@
+ #include "bristolmemorymoog.h"
+ 
+ extern int buildCurrentTable(Baudio *, float);
++extern void doPitchWheel(Baudio *);
+ 
+ /*
+  * Use of these memorymoog global buffers will be an issue with use of multiple