diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2014-02-20 08:38:20 +0200 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2014-02-20 08:38:20 +0200 |
commit | a549e6ac6b6b6dbe30f0486ec078e607c63ab860 (patch) | |
tree | 510f307f30657fda60553346b769b73216117310 /net-wireless/bluez/files/4.34-conditional_libsbc.patch | |
parent | b6ebc3ab027b6c55a57fde0eaedaae6114ed0d81 (diff) |
cleanup....
Diffstat (limited to 'net-wireless/bluez/files/4.34-conditional_libsbc.patch')
-rw-r--r-- | net-wireless/bluez/files/4.34-conditional_libsbc.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/net-wireless/bluez/files/4.34-conditional_libsbc.patch deleted file mode 100644 index e4924c7..0000000 --- a/net-wireless/bluez/files/4.34-conditional_libsbc.patch +++ /dev/null @@ -1,39 +0,0 @@ -The configure stuff is a inconsequent: -- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la - which doesn't get build without alsa or gstreamer. Making this conditional helps. -- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty, - making the build conditional helps again. ---- acinclude.m4.orig 2009-04-06 16:26:14.570780241 +0200 -+++ acinclude.m4 2009-04-06 16:26:59.540779148 +0200 -@@ -330,8 +330,10 @@ - AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) - AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) - -- AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) -- AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) -+ if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then -+ AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) -+ AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) -+ fi - - AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") - AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") ---- audio/Makefile.am.orig 2009-04-06 16:47:21.240681272 +0200 -+++ audio/Makefile.am 2009-04-06 17:42:27.240597715 +0200 -@@ -60,10 +60,16 @@ - - libipc_la_SOURCES = ipc.h ipc.c - -+if AUDIOPLUGIN -+if SBC -+ - noinst_PROGRAMS = ipctest - - ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@ - -+endif -+endif -+ - AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \ - @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ - |