[pulseaudio-discuss] [PATCH] bluetooth: Pull a2dp-codecs.h grom BlueZ

[Colin Guthrie]

'Twas brillig, and Paul Menzel at 31/03/11 10:45 did gyre and gimble:
> Am Donnerstag, den 31.03.2011, 00:56 +0530 schrieb Arun Raghavan:
> 
> Typo in commit summary: s/grom/from/.
> 
>> This pulls a2dp-codecs.h from BlueZ which contains the capabilities
>> structures for SBC and MPEG. We currently have these manually added to
>> ipc.h, so pulling this header makes our files identical to upstream.
>> ---
>>  src/Makefile.am                                 |    2 +-
>>  src/modules/bluetooth/a2dp-codecs.h             |  116 +++++++++++++++++++++++
>>  src/modules/bluetooth/bluetooth-util.c          |    8 +-
>>  src/modules/bluetooth/ipc.h                     |   28 ------
>>  src/modules/bluetooth/module-bluetooth-device.c |    8 +-
>>  5 files changed, 123 insertions(+), 39 deletions(-)
>>  create mode 100644 src/modules/bluetooth/a2dp-codecs.h
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index f3717ce..a7fc1ca 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -1851,7 +1851,7 @@ libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h
>>  libbluetooth_ipc_la_LDFLAGS = -avoid-version
>>  libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
>>  libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
>> -BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h
>> +BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h a2dp-codecs.h
> 
> Sort these alphabetically?

Actually, no. a2dp-codecs.h should not go here, it should be added to
libbluetooth_ipc_la_SOURCES otherwise the file doesn't get into the dist
tarball. rtp.h is a special case as it's added to
libbluetooth_util_la_SOURCES the line below. The BLUETOOTH_IPC_FILES
thing is just a hack to make update-sbc work.

> Otherwise this looks good. Do you have a public Git tree with this patch
> applied?

I've tweaked Arun's patch (and the typo) you spotted) to include this
change and pushed it to git master.

Col


-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]