| 1 |
dev-zero 09/04/07 09:03:40 |
| 2 |
|
| 3 |
Added: 4.34-conditional_libsbc.patch |
| 4 |
Log: |
| 5 |
Version bump, fixed build problems with --disable{alsa,gstreamer}. Bug #260374 has already been solved in an earlier bump. |
| 6 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-wireless/bluez/files/4.34-conditional_libsbc.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.34-conditional_libsbc.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/bluez/files/4.34-conditional_libsbc.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 4.34-conditional_libsbc.patch |
| 15 |
=================================================================== |
| 16 |
The configure stuff is a inconsequent: |
| 17 |
- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la |
| 18 |
which doesn't get build without alsa or gstreamer. Making this conditional helps. |
| 19 |
- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty, |
| 20 |
making the build conditional helps again. |
| 21 |
--- acinclude.m4.orig 2009-04-06 16:26:14.570780241 +0200 |
| 22 |
+++ acinclude.m4 2009-04-06 16:26:59.540779148 +0200 |
| 23 |
@@ -330,8 +330,10 @@ |
| 24 |
AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) |
| 25 |
AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) |
| 26 |
|
| 27 |
- AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) |
| 28 |
- AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) |
| 29 |
+ if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then |
| 30 |
+ AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) |
| 31 |
+ AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) |
| 32 |
+ fi |
| 33 |
|
| 34 |
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") |
| 35 |
AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") |
| 36 |
--- audio/Makefile.am.orig 2009-04-06 16:47:21.240681272 +0200 |
| 37 |
+++ audio/Makefile.am 2009-04-06 17:42:27.240597715 +0200 |
| 38 |
@@ -60,10 +60,16 @@ |
| 39 |
|
| 40 |
libipc_la_SOURCES = ipc.h ipc.c |
| 41 |
|
| 42 |
+if AUDIOPLUGIN |
| 43 |
+if SBC |
| 44 |
+ |
| 45 |
noinst_PROGRAMS = ipctest |
| 46 |
|
| 47 |
ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@ |
| 48 |
|
| 49 |
+endif |
| 50 |
+endif |
| 51 |
+ |
| 52 |
AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \ |
| 53 |
@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ |
Archives