diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:47:28 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:10:04 +0100 |
| commit | ead4ab30d902b383a1af386f90d4bc673f90ec6f (patch) | |
| tree | f44f85edf6188e69ccb929ed6f6cb90adb9cb888 /media-sound/tapestrea | |
| parent | media-sound/mp3info: respect ${PKG_CONFIG} (diff) | |
| download | gentoo-ead4ab30d902b383a1af386f90d4bc673f90ec6f.tar.gz gentoo-ead4ab30d902b383a1af386f90d4bc673f90ec6f.tar.bz2 gentoo-ead4ab30d902b383a1af386f90d4bc673f90ec6f.zip | |
media-sound/tapestrea: respect ${PKG_CONFIG}
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound/tapestrea')
| -rw-r--r-- | media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch index 3f866d5c88e5..a065ce0e683e 100644 --- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch +++ b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch @@ -1,34 +1,33 @@ --- a/src/makefile.alsa +++ b/src/makefile.alsa @@ -3,7 +3,7 @@ - CHUCK_DIR=../scripting/chuck-1.2.1.2/src
- INCLUDES=-I$(CHUCK_DIR)
- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`
-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread
-
- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
- taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
+ CHUCK_DIR=../scripting/chuck-1.2.1.2/src + INCLUDES=-I$(CHUCK_DIR) + FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c +-LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` ++LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `${PKG_CONFIG} --libs gtk+-2.0` -lpthread + + TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \ + taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \ --- a/scripting/chuck-1.2.1.2/src/makefile.alsa +++ b/scripting/chuck-1.2.1.2/src/makefile.alsa @@ -5,7 +5,7 @@ - INCLUDES=
- CFLAGS?= -O3
- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
--LIBS=-lasound -lstdc++ -ldl -lm
-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
- SF_OBJ=util_sndfile.o
-
- ifneq ($(CHUCK_DEBUG),)
-diff -Naur a/src/makefile.alsa b/src/makefile.alsa ---- a/src/makefile.alsa 2014-01-30 02:21:02.173891275 +0100 -+++ b/src/makefile.alsa 2014-01-30 02:21:23.026891253 +0100 + INCLUDES= + CFLAGS?= -O3 + FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS) +-LIBS=-lasound -lstdc++ -ldl -lm ++LIBS=-lasound -lstdc++ -lm -lpthread -ldl + SF_OBJ=util_sndfile.o + + ifneq ($(CHUCK_DEBUG),) +--- a/src/makefile.alsa ++++ b/src/makefile.alsa @@ -48,7 +48,7 @@ - OBJS+=ui_scripting.o
- # scripting disable needs most of chuck anyway due to includes
- # in latest rtaudio.cpp, so always keep this line:
--LIBS+=$(CHUCK_OBJS)
-+LIBS+=$(CHUCK_OBJS) -ldl
-
- # uncomment to use preconfigured sndfile
- #FLAGS+=-D__USE_SNDFILE_PRECONF__
+ OBJS+=ui_scripting.o + # scripting disable needs most of chuck anyway due to includes + # in latest rtaudio.cpp, so always keep this line: +-LIBS+=$(CHUCK_OBJS) ++LIBS+=$(CHUCK_OBJS) -ldl + + # uncomment to use preconfigured sndfile + #FLAGS+=-D__USE_SNDFILE_PRECONF__ |