Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/giada/files: giada-0.5.4-flags.patch giada-0.5.4-configure.patch
Date: Tue, 27 Nov 2012 07:38:56
Message-Id: 20121127073844.EBE8F20C65@flycatcher.gentoo.org
1 radhermit 12/11/27 07:38:44
2
3 Added: giada-0.5.4-flags.patch giada-0.5.4-configure.patch
4 Log:
5 Initial import, ebuild by me.
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 media-sound/giada/files/giada-0.5.4-flags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/giada/files/giada-0.5.4-flags.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/giada/files/giada-0.5.4-flags.patch?rev=1.1&content-type=text/plain
14
15 Index: giada-0.5.4-flags.patch
16 ===================================================================
17 --- giada-0.5.4/src/Makefile.am
18 +++ giada-0.5.4/src/Makefile.am
19 @@ -1,6 +1,6 @@
20 AUTOMAKE_OPTIONS = foreign
21
22 -AM_CXXFLAGS = -Wall -pedantic -Werror
23 +AM_CXXFLAGS = -Wall -pedantic
24
25 # aeffect.h (header from VST SDK) uses 'long long' which is not supported
26 # in ISO C++ 1998 and -Werror flag breaks the compilation.
27
28
29
30 1.1 media-sound/giada/files/giada-0.5.4-configure.patch
31
32 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/giada/files/giada-0.5.4-configure.patch?rev=1.1&view=markup
33 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/giada/files/giada-0.5.4-configure.patch?rev=1.1&content-type=text/plain
34
35 Index: giada-0.5.4-configure.patch
36 ===================================================================
37 --- giada-0.5.4/configure.ac
38 +++ giada-0.5.4/configure.ac
39 @@ -52,6 +52,27 @@
40 [AC_DEFINE(WITH_VST)]
41 )
42
43 +AC_ARG_ENABLE(
44 + alsa,
45 + AS_HELP_STRING([--disable-alsa], [disable alsa support]),
46 + [AC_DEFINE(WITH_ALSA)]
47 +)
48 +AM_CONDITIONAL(ALSA, test "x$enable_alsa" = "xtrue")
49 +
50 +AC_ARG_ENABLE(
51 + jack,
52 + AS_HELP_STRING([--enable-jack], [enable jack support]),
53 + [AC_DEFINE(WITH_JACK)]
54 +)
55 +AM_CONDITIONAL(JACK, test "x$enable_jack" = "xtrue")
56 +
57 +AC_ARG_ENABLE(
58 + pulse,
59 + AS_HELP_STRING([--enable-pulse], [enable pulseaudio support]),
60 + [AC_DEFINE(WITH_PULSE)]
61 +)
62 +AM_CONDITIONAL(PULSE, test "x$enable_pulse" = "xtrue")
63 +
64 # ----------------------------------------------------------------------
65
66 # Checks for programs.
67 --- giada-0.5.4/src/Makefile.am
68 +++ giada-0.5.4/src/Makefile.am
69 @@ -38,7 +38,16 @@
70 # inside configure.ac
71 if LINUX
72 giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -lrtaudio \
73 - -ljack -lasound -lpthread -ldl -lpulse-simple
74 + -lpthread -ldl
75 +if ALSA
76 +giada_LDADD += -lasound
77 +endif
78 +if JACK
79 +giada_LDADD += -ljack
80 +endif
81 +if PULSE
82 +giada_LDADD += -lpulse-simple
83 +endif
84 endif
85 if WINDOWS
86 giada_LDADD = -lole32 -lrtaudio -ldsound -lwinmm -lwsock32 -lm \