/[gentoo-x86]/net-wireless/bluez/files/4.34-conditional_libsbc.patch
Gentoo

Contents of /net-wireless/bluez/files/4.34-conditional_libsbc.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Mar 20 16:57:35 2011 UTC (3 years, 3 months ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump, remove old, bump to eapi4, don't install .c and .o files (bug #356529 by Alec M.), init script needs hostname (bug #356739 by Johan Myreen), libnl dep is no longer needed (bug #359105 by Yaroslav Isakov).

(Portage version: 2.1.9.43/cvs/Linux x86_64)

1 The configure stuff is a inconsequent:
2 - even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la
3 which doesn't get build without alsa or gstreamer. Making this conditional helps.
4 - ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty,
5 making the build conditional helps again.
6 --- acinclude.m4.orig 2009-04-06 16:26:14.570780241 +0200
7 +++ acinclude.m4 2009-04-06 16:26:59.540779148 +0200
8 @@ -330,8 +330,10 @@
9 AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
10 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
11
12 - AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
13 - AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
14 + if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then
15 + AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
16 + AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
17 + fi
18
19 AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
20 AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
21 --- audio/Makefile.am.orig 2009-04-06 16:47:21.240681272 +0200
22 +++ audio/Makefile.am 2009-04-06 17:42:27.240597715 +0200
23 @@ -60,10 +60,16 @@
24
25 libipc_la_SOURCES = ipc.h ipc.c
26
27 +if AUDIOPLUGIN
28 +if SBC
29 +
30 noinst_PROGRAMS = ipctest
31
32 ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
33
34 +endif
35 +endif
36 +
37 AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \
38 @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
39

  ViewVC Help
Powered by ViewVC 1.1.20