| 1 |
aballier 08/05/01 20:36:54 |
| 2 |
|
| 3 |
Added: bristol-0.20.5-asneeded.patch |
| 4 |
bristol-0.20.5-cflags.patch |
| 5 |
Log: |
| 6 |
Version bump, add some patches to respect user set cflags/ldflags and not fail with asneeded, plus some useflags that can now do something |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/bristol/files/bristol-0.20.5-asneeded.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bristol/files/bristol-0.20.5-asneeded.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bristol/files/bristol-0.20.5-asneeded.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: bristol-0.20.5-asneeded.patch |
| 16 |
=================================================================== |
| 17 |
Index: bristol-0.20.5/libbrighton/Makefile.am |
| 18 |
=================================================================== |
| 19 |
--- bristol-0.20.5.orig/libbrighton/Makefile.am |
| 20 |
+++ bristol-0.20.5/libbrighton/Makefile.am |
| 21 |
@@ -4,5 +4,7 @@ AM_CFLAGS = -Wall -g -I$(srcdir)/../incl |
| 22 |
libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 23 |
|
| 24 |
lib_LTLIBRARIES = libbrighton.la |
| 25 |
+libbrighton_la_LIBADD=$(top_builddir)/libbrightonX11/libB11.la -lm |
| 26 |
+ |
| 27 |
libbrighton_la_SOURCES = brightonBitmaps.c brightonButton.c brightonC.c brightonColorMgt.c brightonDevice.c brightonDispatch.c brightonDisplay.c brightonDisplayMgt.c brightonEventHandlers.c brightonHammond.c brightonInterface.c brightonKbd.c brightonLayer.c brightonPanelMgt.c brightonPic.c brightonRender.c brightonRotary.c brightonScale.c brightonShadowMgt.c brightonTouchpanel.c brightonVu.c brightonWindowMgt.c brightonXpmRead.c brightonkeymappings.h brightonMenu.c brightonLedBlock.c brightonHButton.c |
| 28 |
|
| 29 |
Index: bristol-0.20.5/libbrightonX11/Makefile.am |
| 30 |
=================================================================== |
| 31 |
--- bristol-0.20.5.orig/libbrightonX11/Makefile.am |
| 32 |
+++ bristol-0.20.5/libbrightonX11/Makefile.am |
| 33 |
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign |
| 34 |
AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ |
| 35 |
|
| 36 |
libB11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 37 |
+libB11_la_LIBADD= -lX11 |
| 38 |
|
| 39 |
lib_LTLIBRARIES = libB11.la |
| 40 |
libB11_la_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c |
| 41 |
Index: bristol-0.20.5/libbristol/Makefile.am |
| 42 |
=================================================================== |
| 43 |
--- bristol-0.20.5.orig/libbristol/Makefile.am |
| 44 |
+++ bristol-0.20.5/libbristol/Makefile.am |
| 45 |
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign |
| 46 |
|
| 47 |
AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ |
| 48 |
libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 49 |
+libbristol_la_LIBADD=$(top_builddir)/libbristolaudio/libbristolaudio.la |
| 50 |
|
| 51 |
lib_LTLIBRARIES = libbristol.la |
| 52 |
libbristol_la_SOURCES = audioRoutines.c bristolcdefs.c debugging.c mixroutines.c opmgt.c |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.1 media-sound/bristol/files/bristol-0.20.5-cflags.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bristol/files/bristol-0.20.5-cflags.patch?rev=1.1&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bristol/files/bristol-0.20.5-cflags.patch?rev=1.1&content-type=text/plain |
| 60 |
|
| 61 |
Index: bristol-0.20.5-cflags.patch |
| 62 |
=================================================================== |
| 63 |
Index: bristol-0.20.5/brighton/Makefile.am |
| 64 |
=================================================================== |
| 65 |
--- bristol-0.20.5.orig/brighton/Makefile.am |
| 66 |
+++ bristol-0.20.5/brighton/Makefile.am |
| 67 |
@@ -1,9 +1,11 @@ |
| 68 |
AUTOMAKE_OPTIONS = foreign |
| 69 |
|
| 70 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ |
| 71 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ |
| 72 |
|
| 73 |
-LDFLAGS = -Bdynamic -L../libbrighton/.libs -L../libbristolmidi/.libs -L../libbrightonX11/.libs -L/usr/X11R6/lib -lB11 -lbrighton -lbristolmidi @ALSA_LIBS@ -lX11 -lm -lpthread |
| 74 |
|
| 75 |
bin_PROGRAMS = brighton |
| 76 |
+brighton_LDFLAGS = -Bdynamic -L../libbrighton/.libs -L../libbristolmidi/.libs -L../libbrightonX11/.libs -L/usr/X11R6/lib |
| 77 |
+brighton_LDADD = -lB11 -lbrighton -lbristolmidi @ALSA_LIBS@ -lX11 -lm -lpthread |
| 78 |
+ |
| 79 |
brighton_SOURCES = brightonArp2600.c brightonAxxe.c brighton.c brightonControllers.c brightonDX.c brightonExplorer.c brightonHammondB3.c brightonHammond.c brightonJuno.c brightonMemoryMoog.c brightonMini.c brightonMixer.c brightonMixerMemory.c brightonMixerMenu.c brightonMS20.c brightonOBXa.c brightonOBX.c brightonOdyssey.c brightonPoly6.c brightonPoly.c brightonProphet10.c brightonProphet52.c brightonProphet.c brightonRhodesBass.c brightonRhodes.c brightonRoutines.c brightonSAks.c brightonVox.c brightonKeyboards.h brightonKeys.h brightonMini.h brightonMixer.h brightonMixerMemory.h brightonhelp.h brightonSolina.c brightonRoadRunner.c brightonGranular.c brightonRealistic.c brightonVoxM2.c brightonJupiter.c brightonBitOne.c brightonMaster.c |
| 80 |
|
| 81 |
Index: bristol-0.20.5/bristol/Makefile.am |
| 82 |
=================================================================== |
| 83 |
--- bristol-0.20.5.orig/bristol/Makefile.am |
| 84 |
+++ bristol-0.20.5/bristol/Makefile.am |
| 85 |
@@ -1,10 +1,10 @@ |
| 86 |
AUTOMAKE_OPTIONS = foreign |
| 87 |
|
| 88 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I. @BRISTOL_HAS_JACK@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ `pkg-config --silence-errors --cflags jack` `pkg-config --silence-errors --cflags alsa` |
| 89 |
- |
| 90 |
-LDFLAGS = -Bdynamic `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -lbristolmidi -lbristolaudio -lbristol -lm -lpthread |
| 91 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I. @BRISTOL_HAS_JACK@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ |
| 92 |
|
| 93 |
bin_PROGRAMS = bristol |
| 94 |
+bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs |
| 95 |
+bristol_LDADD = @JACK_LIBS@ @ALSA_LIBS@ -lbristolmidi -lbristolaudio -lbristol -lm -lpthread |
| 96 |
|
| 97 |
bristol_SOURCES = aksdco.c aksenv.c aksfilter.c aksreverb.c arpdco.c audioEngine.c audiothread.c bristolaks.c bristolarp2600.c bristolaxxe.c bristoldx.c bristolexplorer.c bristolhammond.c bristoljuno.c bristol.c bristolmemorymoog.c bristolmixer.c bristolmm.c bristolobx.c bristolodyssey.c bristolpoly6.c bristolpoly.c bristolprophet52.c bristolprophet.c bristolsampler.c bristolsystem.c bristolvox.c dca.c dco.c dimensionD.c dxop.c electroswitch.c envelope.c expdco.c filter2.c filter.c follower.c hammond.c hammondchorus.c hpf.c junodco.c lfo.c midihandlers.c midinote.c midithread.c noise.c prophetdco.c resonator.c reverb.c ringmod.c rotary.c sdco.c sdcoutils.c soundManager.c thesermon.c vibrachorus.c vox.c aksdco.h aksenv.h aksfilter.h aksreverb.h arpdco.h bristolaks.h bristolarp2600.h bristolaxxe.h bristolexplorer.h bristoljuno.h bristolmemorymoog.h bristolmixer.h bristolmm.h bristolobx.h bristolodyssey.h bristolpoly6.h bristolpoly.h bristolprophet.h bristolsampler.h click.h dc |
| 98 |
a.h dco.h dimensionD.h dxop.h electroswitch.h envelope.h expdco.h filter.h follower.h hammondchorus.h hammond.h hpf.h hum.h junodco.h lfo.h noise.h palette.h prophetdco.h resonator.h reverb.h ringmod.h rotary.h sdco.h thesermon.h vibrachorus.h vox.h bristolsolina.c solina.h bristolroadrunner.c roadrunner.h bristolgranular.c granular.h granulardco.c granulardco.h bristolrealistic.c bristolmg1.h bristoljupiter.c bristolbitone.c bit1osc.c bit1osc.h arpeggiator.c |
| 99 |
|
| 100 |
Index: bristol-0.20.5/libbrighton/Makefile.am |
| 101 |
=================================================================== |
| 102 |
--- bristol-0.20.5.orig/libbrighton/Makefile.am |
| 103 |
+++ bristol-0.20.5/libbrighton/Makefile.am |
| 104 |
@@ -1,6 +1,6 @@ |
| 105 |
AUTOMAKE_OPTIONS = foreign |
| 106 |
|
| 107 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. |
| 108 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. |
| 109 |
libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 110 |
|
| 111 |
lib_LTLIBRARIES = libbrighton.la |
| 112 |
Index: bristol-0.20.5/libbristol/Makefile.am |
| 113 |
=================================================================== |
| 114 |
--- bristol-0.20.5.orig/libbristol/Makefile.am |
| 115 |
+++ bristol-0.20.5/libbristol/Makefile.am |
| 116 |
@@ -1,6 +1,6 @@ |
| 117 |
AUTOMAKE_OPTIONS = foreign |
| 118 |
|
| 119 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ |
| 120 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ |
| 121 |
libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 122 |
|
| 123 |
lib_LTLIBRARIES = libbristol.la |
| 124 |
Index: bristol-0.20.5/libbristolaudio/Makefile.am |
| 125 |
=================================================================== |
| 126 |
--- bristol-0.20.5.orig/libbristolaudio/Makefile.am |
| 127 |
+++ bristol-0.20.5/libbristolaudio/Makefile.am |
| 128 |
@@ -1,8 +1,9 @@ |
| 129 |
AUTOMAKE_OPTIONS = foreign |
| 130 |
|
| 131 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ `pkg-config --silence-errors --cflags alsa` `pkg-config --silence-errors --cflags jack` |
| 132 |
-LDFLAGS = `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` |
| 133 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @ALSA_CFLAGS@ @JACK_CFLAGS@ |
| 134 |
+ |
| 135 |
libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 136 |
+libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ |
| 137 |
|
| 138 |
lib_LTLIBRARIES = libbristolaudio.la |
| 139 |
libbristolaudio_la_SOURCES = audioEngineALSA.c audioGUIALSA.c audioMastering.c audioEngine.c audioGUI.c audioNetClient.c audioEngineOSS.c audioGUIOSS.c audioEngineJack.c |
| 140 |
Index: bristol-0.20.5/libbristolmidi/Makefile.am |
| 141 |
=================================================================== |
| 142 |
--- bristol-0.20.5.orig/libbristolmidi/Makefile.am |
| 143 |
+++ bristol-0.20.5/libbristolmidi/Makefile.am |
| 144 |
@@ -1,8 +1,8 @@ |
| 145 |
AUTOMAKE_OPTIONS = foreign |
| 146 |
|
| 147 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol `pkg-config --silence-errors --cflags alsa` `pkg-config --silence-errors --cflags jack` -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ |
| 148 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ |
| 149 |
libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 150 |
-LDFLAGS = `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` |
| 151 |
+libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ |
| 152 |
|
| 153 |
lib_LTLIBRARIES = libbristolmidi.la |
| 154 |
libbristolmidi_la_SOURCES = inetClient.c inetServer.c interface.c midiALSADevMan.c midiDevMan.c midiMsgMan.c midiOSSDevMan.c midiParse.c midiRoutines.c midiSeqDevMan.c midiTCPDevMan.c slabmessages.h socketToolKit.c slabmessages.h midiFileMgt.c midiJACKDevMan.c |
| 155 |
Index: bristol-0.20.5/libbrightonX11/Makefile.am |
| 156 |
=================================================================== |
| 157 |
--- bristol-0.20.5.orig/libbrightonX11/Makefile.am |
| 158 |
+++ bristol-0.20.5/libbrightonX11/Makefile.am |
| 159 |
@@ -1,6 +1,6 @@ |
| 160 |
AUTOMAKE_OPTIONS = foreign |
| 161 |
|
| 162 |
-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ |
| 163 |
+AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ |
| 164 |
|
| 165 |
libB11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ |
| 166 |
|
| 167 |
Index: bristol-0.20.5/configure.ac |
| 168 |
=================================================================== |
| 169 |
--- bristol-0.20.5.orig/configure.ac |
| 170 |
+++ bristol-0.20.5/configure.ac |
| 171 |
@@ -58,38 +58,49 @@ then |
| 172 |
AC_SUBST(BRIGHTON_HAS_XIMAGE) |
| 173 |
fi |
| 174 |
|
| 175 |
+PKG_PROG_PKG_CONFIG |
| 176 |
+ |
| 177 |
# Checks for library functions. |
| 178 |
AC_ARG_ENABLE(alsa, [ --disable-alsa ignore ALSA driver ], |
| 179 |
TRY_ALSA=$enableval , TRY_ALSA=yes ) |
| 180 |
|
| 181 |
HAVE_ALSA=false |
| 182 |
BRISTOL_HAS_ALSA=0 |
| 183 |
-if test "x$TRY_ALSA" = "xyes" |
| 184 |
+if test "x$TRY_ALSA" = "xyes" ; |
| 185 |
then |
| 186 |
# check for ALSA >= 1.0.0 |
| 187 |
PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, |
| 188 |
[HAVE_ALSA=true |
| 189 |
BRISTOL_HAS_ALSA=1 |
| 190 |
- ], [true], [-lm] |
| 191 |
+ ], [true] |
| 192 |
) |
| 193 |
+else |
| 194 |
+ ALSA_CFLAGS= |
| 195 |
+ ALSA_LIBS= |
| 196 |
+ AC_SUBST(ALSA_CFLAGS) |
| 197 |
+ AC_SUBST(ALSA_LIBS) |
| 198 |
fi |
| 199 |
AC_SUBST(BRISTOL_HAS_ALSA) |
| 200 |
|
| 201 |
AC_ARG_ENABLE(jack, [ --disable-jack ignore JACK driver ], |
| 202 |
TRY_JACK=$enableval , TRY_JACK=yes ) |
| 203 |
HAVE_JACK="false" |
| 204 |
-if test "x$TRY_JACK" = "xyes" |
| 205 |
+if test "x$TRY_JACK" = "xyes" ; |
| 206 |
then |
| 207 |
# check for JACK >= 0.99.0 |
| 208 |
PKG_CHECK_MODULES(JACK, jack >= 0.99.0, |
| 209 |
[HAVE_JACK="true" |
| 210 |
- JACK_LIBS=-lasound |
| 211 |
JACK_DEFAULT_DRIVER=\"jack\" |
| 212 |
BRISTOL_HAS_JACK=-D_BRISTOL_JACK |
| 213 |
- ], [true], [-lm] |
| 214 |
+ ], [true] |
| 215 |
) |
| 216 |
AC_SUBST(JACK_LIBS) |
| 217 |
AC_SUBST(BRISTOL_HAS_JACK) |
| 218 |
+else |
| 219 |
+ JACK_CFLAGS= |
| 220 |
+ JACK_LIBS= |
| 221 |
+ AC_SUBST(JACK_CFLAGS) |
| 222 |
+ AC_SUBST(JACK_LIBS) |
| 223 |
fi |
| 224 |
AM_CONDITIONAL(HAVE_JACK, $HAVE_JACK) |
| 225 |
|
| 226 |
|
| 227 |
|
| 228 |
|
| 229 |
-- |
| 230 |
gentoo-commits@l.g.o mailing list |
Archives