* [Buildroot] [NEXT 02/17] libpjsip: add enable sound option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-11 9:29 ` Arnout Vandecappelle
2017-11-10 20:20 ` [Buildroot] [NEXT 03/17] libpjsip: add alsa option Adam Duskett
` (15 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
This is the first patch in a series that will enable several features
for libpjsip. This patch does the following:
- make libpjsip a menuconfig option
- add a option for "Enable sound"
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 11 ++++++++++-
package/libpjsip/libpjsip.mk | 5 ++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 727d2ec3d0..a39d053e03 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LIBPJSIP
+menuconfig BR2_PACKAGE_LIBPJSIP
bool "libpjsip"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -10,5 +10,14 @@ config BR2_PACKAGE_LIBPJSIP
http://www.pjsip.org
+if BR2_PACKAGE_LIBPJSIP
+
+config BR2_PACKAGE_LIBPJSIP_SOUND
+ bool "Enable sound"
+ help
+ Use sound instead of a null device.
+
+endif # BR2_PACKAGE_LIBPJSIP
+
comment "libpjsip needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index c772d4117a..a9d4ed4ed0 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \
CFLAGS="$(LIBPJSIP_CFLAGS)"
LIBPJSIP_CONF_OPTS = \
- --disable-sound \
--disable-gsm-codec \
--disable-speex-codec \
--disable-speex-aec \
@@ -68,4 +67,8 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
LIBPJSIP_DEPENDENCIES += util-linux
endif
+ifneq ($(BR2_PACKAGE_LIBPJSIP_SOUND),y)
+LIBPJSIP_CONF_OPTS += --disable-sound
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 02/17] libpjsip: add enable sound option
2017-11-10 20:20 ` [Buildroot] [NEXT 02/17] libpjsip: add enable sound option Adam Duskett
@ 2017-11-11 9:29 ` Arnout Vandecappelle
2017-11-13 14:36 ` Adam Duskett
0 siblings, 1 reply; 25+ messages in thread
From: Arnout Vandecappelle @ 2017-11-11 9:29 UTC (permalink / raw)
To: buildroot
Hi Adam,
On 10-11-17 21:20, Adam Duskett wrote:
> This is the first patch in a series that will enable several features
> for libpjsip. This patch does the following:
>
> - make libpjsip a menuconfig option
You could have done that in a separate patch, to make it easier to apply only
part of the series.
> - add a option for "Enable sound"
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/libpjsip/Config.in | 11 ++++++++++-
> package/libpjsip/libpjsip.mk | 5 ++++-
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
> index 727d2ec3d0..a39d053e03 100644
> --- a/package/libpjsip/Config.in
> +++ b/package/libpjsip/Config.in
> @@ -1,4 +1,4 @@
> -config BR2_PACKAGE_LIBPJSIP
> +menuconfig BR2_PACKAGE_LIBPJSIP
> bool "libpjsip"
> depends on BR2_INSTALL_LIBSTDCPP
> depends on BR2_TOOLCHAIN_HAS_THREADS
> @@ -10,5 +10,14 @@ config BR2_PACKAGE_LIBPJSIP
>
> http://www.pjsip.org
>
> +if BR2_PACKAGE_LIBPJSIP
> +
> +config BR2_PACKAGE_LIBPJSIP_SOUND
> + bool "Enable sound"
> + help
> + Use sound instead of a null device.
Is it useful to make this optional? Does it have a significant impact on size?
Same goes for all the other options you add, e.g. v4l2 support: except if the
v4l2 support adds significantly to the size of libpjsip, you can just enable it
when BR2_PACKAGE_LIBV4L is selected.
That said, you may have good reasons to choose this route. It helps to explain
that in the commit log.
Finally, specifically about sound: does this option make sense if no sound
backend is selected?
> +
> +endif # BR2_PACKAGE_LIBPJSIP
> +
> comment "libpjsip needs a toolchain w/ C++, threads"
> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
> index c772d4117a..a9d4ed4ed0 100644
> --- a/package/libpjsip/libpjsip.mk
> +++ b/package/libpjsip/libpjsip.mk
> @@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \
> CFLAGS="$(LIBPJSIP_CFLAGS)"
>
> LIBPJSIP_CONF_OPTS = \
> - --disable-sound \
> --disable-gsm-codec \
> --disable-speex-codec \
> --disable-speex-aec \
> @@ -68,4 +67,8 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
> LIBPJSIP_DEPENDENCIES += util-linux
> endif
>
> +ifneq ($(BR2_PACKAGE_LIBPJSIP_SOUND),y)
We prefer to use ifeq ($(BR2_PACKAGE_LIBPJSIP_SOUND),)
However, why not do --enable-sound? You mention something for the codecs, does
that also apply here?
I'm going to mark the entire series as Changes Requested, even though you may
actually keep it mostly as it is after discussion. Still, there are probably
small things to be fixed in some patches (like the typo in the first one) and
it's easier to resubmit the series as a whole.
Regards,
Arnout
> +LIBPJSIP_CONF_OPTS += --disable-sound
> +endif
> +
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 02/17] libpjsip: add enable sound option
2017-11-11 9:29 ` Arnout Vandecappelle
@ 2017-11-13 14:36 ` Adam Duskett
2017-11-13 16:02 ` Arnout Vandecappelle
0 siblings, 1 reply; 25+ messages in thread
From: Adam Duskett @ 2017-11-13 14:36 UTC (permalink / raw)
To: buildroot
Hello
On Sat, Nov 11, 2017 at 4:29 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> Hi Adam,
>
> On 10-11-17 21:20, Adam Duskett wrote:
>> This is the first patch in a series that will enable several features
>> for libpjsip. This patch does the following:
>>
>> - make libpjsip a menuconfig option
>
> You could have done that in a separate patch, to make it easier to apply only
> part of the series.
>
>> - add a option for "Enable sound"
>>
>> Signed-off-by: Adam Duskett <aduskett@gmail.com>
>> ---
>> package/libpjsip/Config.in | 11 ++++++++++-
>> package/libpjsip/libpjsip.mk | 5 ++++-
>> 2 files changed, 14 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
>> index 727d2ec3d0..a39d053e03 100644
>> --- a/package/libpjsip/Config.in
>> +++ b/package/libpjsip/Config.in
>> @@ -1,4 +1,4 @@
>> -config BR2_PACKAGE_LIBPJSIP
>> +menuconfig BR2_PACKAGE_LIBPJSIP
>> bool "libpjsip"
>> depends on BR2_INSTALL_LIBSTDCPP
>> depends on BR2_TOOLCHAIN_HAS_THREADS
>> @@ -10,5 +10,14 @@ config BR2_PACKAGE_LIBPJSIP
>>
>> http://www.pjsip.org
>>
>> +if BR2_PACKAGE_LIBPJSIP
>> +
>> +config BR2_PACKAGE_LIBPJSIP_SOUND
>> + bool "Enable sound"
>> + help
>> + Use sound instead of a null device.
>
> Is it useful to make this optional? Does it have a significant impact on size?
>
> Same goes for all the other options you add, e.g. v4l2 support: except if the
> v4l2 support adds significantly to the size of libpjsip, you can just enable it
> when BR2_PACKAGE_LIBV4L is selected.
>
> That said, you may have good reasons to choose this route. It helps to explain
> that in the commit log.
Yeah, forgot to send a cover letter, sorry about that!
I could have! However; Yann and I had a discussion right after I
submitted the patch,
and I bring this argument:
As a person who is actively developing a project on libpjsip, I have a
few arguments
as to why I wanted to go this route:
1) Unlike smaller packages, libpjsip is pretty big, with a ton of
options, so having a bunch
of dependencies enabled if the user just so happens to have other
options enabled would
be a bit awkward instead of going for just a small option that selects
the dependency for you.
2) Fine grain control is easier for the codecs as I don't want to
enable all the codecs and support
them. With the product I am developing, I really don't want L16/iLBC
enabled, mainly because
no customer I know of want, have requested, or use them, and having
them enabled by default would
be a hassle (although I could just create a patch for my build as well. :] )
>
> Finally, specifically about sound: does this option make sense if no sound
> backend is selected?
>
Well, it compiles. The reason I did this, was because I can allow
this option to de-select "--disable-sound"
then the next options are for oss/alsa/portaudio. I am sure there are
better ways, but I am not super great
at .mk files.
>> +
>> +endif # BR2_PACKAGE_LIBPJSIP
>> +
>> comment "libpjsip needs a toolchain w/ C++, threads"
>> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
>> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
>> index c772d4117a..a9d4ed4ed0 100644
>> --- a/package/libpjsip/libpjsip.mk
>> +++ b/package/libpjsip/libpjsip.mk
>> @@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \
>> CFLAGS="$(LIBPJSIP_CFLAGS)"
>>
>> LIBPJSIP_CONF_OPTS = \
>> - --disable-sound \
>> --disable-gsm-codec \
>> --disable-speex-codec \
>> --disable-speex-aec \
>> @@ -68,4 +67,8 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
>> LIBPJSIP_DEPENDENCIES += util-linux
>> endif
>>
>> +ifneq ($(BR2_PACKAGE_LIBPJSIP_SOUND),y)
>
> We prefer to use ifeq ($(BR2_PACKAGE_LIBPJSIP_SOUND),)
>
> However, why not do --enable-sound? You mention something for the codecs, does
> that also apply here?
>
Yes, no --enable-sound, only --disable-sound.
>
> I'm going to mark the entire series as Changes Requested, even though you may
> actually keep it mostly as it is after discussion. Still, there are probably
> small things to be fixed in some patches (like the typo in the first one) and
> it's easier to resubmit the series as a whole.
>
Thanks!
>
> Regards,
> Arnout
>
>> +LIBPJSIP_CONF_OPTS += --disable-sound
>> +endif
>> +
>> $(eval $(autotools-package))
>>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Adam
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 02/17] libpjsip: add enable sound option
2017-11-13 14:36 ` Adam Duskett
@ 2017-11-13 16:02 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2017-11-13 16:02 UTC (permalink / raw)
To: buildroot
On 13-11-17 15:36, Adam Duskett wrote:
> Hello
>
> On Sat, Nov 11, 2017 at 4:29 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> Hi Adam,
>>
>> On 10-11-17 21:20, Adam Duskett wrote:
>>> This is the first patch in a series that will enable several features
>>> for libpjsip. This patch does the following:
>>>
>>> - make libpjsip a menuconfig option
>>
>> You could have done that in a separate patch, to make it easier to apply only
>> part of the series.
On second thought, that doesn't make sense since it would be an empty menu.
>>
>>> - add a option for "Enable sound"
>>>
>>> Signed-off-by: Adam Duskett <aduskett@gmail.com>
>>> ---
>>> package/libpjsip/Config.in | 11 ++++++++++-
>>> package/libpjsip/libpjsip.mk | 5 ++++-
>>> 2 files changed, 14 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
>>> index 727d2ec3d0..a39d053e03 100644
>>> --- a/package/libpjsip/Config.in
>>> +++ b/package/libpjsip/Config.in
>>> @@ -1,4 +1,4 @@
>>> -config BR2_PACKAGE_LIBPJSIP
>>> +menuconfig BR2_PACKAGE_LIBPJSIP
>>> bool "libpjsip"
>>> depends on BR2_INSTALL_LIBSTDCPP
>>> depends on BR2_TOOLCHAIN_HAS_THREADS
>>> @@ -10,5 +10,14 @@ config BR2_PACKAGE_LIBPJSIP
>>>
>>> http://www.pjsip.org
>>>
>>> +if BR2_PACKAGE_LIBPJSIP
>>> +
>>> +config BR2_PACKAGE_LIBPJSIP_SOUND
>>> + bool "Enable sound"
>>> + help
>>> + Use sound instead of a null device.
>>
>> Is it useful to make this optional? Does it have a significant impact on size?
>>
>> Same goes for all the other options you add, e.g. v4l2 support: except if the
>> v4l2 support adds significantly to the size of libpjsip, you can just enable it
>> when BR2_PACKAGE_LIBV4L is selected.
>>
>> That said, you may have good reasons to choose this route. It helps to explain
>> that in the commit log.
> Yeah, forgot to send a cover letter, sorry about that!
>
> I could have! However; Yann and I had a discussion right after I
> submitted the patch,
> and I bring this argument:
>
> As a person who is actively developing a project on libpjsip, I have a
> few arguments
> as to why I wanted to go this route:
>
> 1) Unlike smaller packages, libpjsip is pretty big, with a ton of
> options, so having a bunch
> of dependencies enabled if the user just so happens to have other
> options enabled would
> be a bit awkward instead of going for just a small option that selects
> the dependency for you.
This argument would be true for most packages so I don't think it's valid. And
by making it explicit options, you get the reverse effect: Buildroot users are
used to selecting some libraries and then expect all other packages that can use
those libraries to actually use them. Of course, that's a much smaller impact
(usually when you enable a package you'll immediately see which suboptions you
want to enable as well).
> 2) Fine grain control is easier for the codecs as I don't want to
> enable all the codecs and support
> them. With the product I am developing, I really don't want L16/iLBC
> enabled, mainly because
> no customer I know of want, have requested, or use them, and having
> them enabled by default would
> be a hassle (although I could just create a patch for my build as well. :] )
On IRC you gave an even better reason: if you want to do runtime enumeration of
supported codecs (which you actually do want to do), more codecs means more
runtime and also more application development time. So that's a very good reason
to make it optional. Make sure you add that to the commit message.
>> Finally, specifically about sound: does this option make sense if no sound
>> backend is selected?
>>
> Well, it compiles. The reason I did this, was because I can allow
> this option to de-select "--disable-sound"
> then the next options are for oss/alsa/portaudio. I am sure there are
> better ways, but I am not super great
> at .mk files.
Discussed on IRC, it's not simple :-)
>
>>> +
>>> +endif # BR2_PACKAGE_LIBPJSIP
>>> +
>>> comment "libpjsip needs a toolchain w/ C++, threads"
>>> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
>>> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
>>> index c772d4117a..a9d4ed4ed0 100644
>>> --- a/package/libpjsip/libpjsip.mk
>>> +++ b/package/libpjsip/libpjsip.mk
>>> @@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \
>>> CFLAGS="$(LIBPJSIP_CFLAGS)"
>>>
>>> LIBPJSIP_CONF_OPTS = \
>>> - --disable-sound \
>>> --disable-gsm-codec \
>>> --disable-speex-codec \
>>> --disable-speex-aec \
>>> @@ -68,4 +67,8 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
>>> LIBPJSIP_DEPENDENCIES += util-linux
>>> endif
>>>
>>> +ifneq ($(BR2_PACKAGE_LIBPJSIP_SOUND),y)
>>
>> We prefer to use ifeq ($(BR2_PACKAGE_LIBPJSIP_SOUND),)
>>
>> However, why not do --enable-sound? You mention something for the codecs, does
>> that also apply here?
>>
> Yes, no --enable-sound, only --disable-sound.
Discussed on IRC: most --enable options actually disable it. Needs a comment in
the .mk file to explain that.
Regards,
Arnout
[snip]
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 03/17] libpjsip: add alsa option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
2017-11-10 20:20 ` [Buildroot] [NEXT 02/17] libpjsip: add enable sound option Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-10 20:20 ` [Buildroot] [NEXT 04/17] libpjsip: add oss option Adam Duskett
` (14 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 8 ++++++++
package/libpjsip/libpjsip.mk | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index a39d053e03..a289c90a92 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -17,6 +17,14 @@ config BR2_PACKAGE_LIBPJSIP_SOUND
help
Use sound instead of a null device.
+if BR2_PACKAGE_LIBPJSIP_SOUND
+
+config BR2_PACKAGE_LIBPJSIP_ALSA
+ bool "alsa support"
+ select BR2_PACKAGE_ALSA_LIB
+
+endif # BR2_PACKAGE_LIBPJSIP_SOUND
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index a9d4ed4ed0..f354cd3538 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -71,4 +71,8 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_SOUND),y)
LIBPJSIP_CONF_OPTS += --disable-sound
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_ALSA),y)
+LIBPJSIP_DEPENDENCIES += alsa-lib
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 04/17] libpjsip: add oss option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
2017-11-10 20:20 ` [Buildroot] [NEXT 02/17] libpjsip: add enable sound option Adam Duskett
2017-11-10 20:20 ` [Buildroot] [NEXT 03/17] libpjsip: add alsa option Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-11 9:38 ` Arnout Vandecappelle
2017-11-10 20:20 ` [Buildroot] [NEXT 05/17] libpjsip: add portaudio option Adam Duskett
` (13 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index a289c90a92..0a6398d508 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -23,6 +23,9 @@ config BR2_PACKAGE_LIBPJSIP_ALSA
bool "alsa support"
select BR2_PACKAGE_ALSA_LIB
+config BR2_PACKAGE_LIBPJSIP_OSS
+ bool "OSS support"
+
endif # BR2_PACKAGE_LIBPJSIP_SOUND
endif # BR2_PACKAGE_LIBPJSIP
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index f354cd3538..d02ca4e803 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -35,7 +35,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-ilbc-codec \
--disable-libwebrtc \
--disable-opus \
- --disable-oss \
--disable-ext-sound \
--disable-g711-codec \
--disable-l16-codec \
@@ -75,4 +74,8 @@ ifeq ($(BR2_PACKAGE_LIBPJSIP_ALSA),y)
LIBPJSIP_DEPENDENCIES += alsa-lib
endif
+ifneq ($(BR2_PACKAGE_LIBPJSIP_OSS),y)
+LIBPJSIP_CONF_OPTS += --disable-oss
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 04/17] libpjsip: add oss option
2017-11-10 20:20 ` [Buildroot] [NEXT 04/17] libpjsip: add oss option Adam Duskett
@ 2017-11-11 9:38 ` Arnout Vandecappelle
2017-11-13 15:04 ` Adam Duskett
0 siblings, 1 reply; 25+ messages in thread
From: Arnout Vandecappelle @ 2017-11-11 9:38 UTC (permalink / raw)
To: buildroot
On 10-11-17 21:20, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/libpjsip/Config.in | 3 +++
> package/libpjsip/libpjsip.mk | 5 ++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
> index a289c90a92..0a6398d508 100644
> --- a/package/libpjsip/Config.in
> +++ b/package/libpjsip/Config.in
> @@ -23,6 +23,9 @@ config BR2_PACKAGE_LIBPJSIP_ALSA
> bool "alsa support"
> select BR2_PACKAGE_ALSA_LIB
>
> +config BR2_PACKAGE_LIBPJSIP_OSS
> + bool "OSS support"
I don't think adding support for OSS is useful. OSS has been deprecated for,
what, 10 years now?
Regards,
Arnout
> +
> endif # BR2_PACKAGE_LIBPJSIP_SOUND
>
> endif # BR2_PACKAGE_LIBPJSIP
> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
> index f354cd3538..d02ca4e803 100644
> --- a/package/libpjsip/libpjsip.mk
> +++ b/package/libpjsip/libpjsip.mk
> @@ -35,7 +35,6 @@ LIBPJSIP_CONF_OPTS = \
> --disable-ilbc-codec \
> --disable-libwebrtc \
> --disable-opus \
> - --disable-oss \
> --disable-ext-sound \
> --disable-g711-codec \
> --disable-l16-codec \
> @@ -75,4 +74,8 @@ ifeq ($(BR2_PACKAGE_LIBPJSIP_ALSA),y)
> LIBPJSIP_DEPENDENCIES += alsa-lib
> endif
>
> +ifneq ($(BR2_PACKAGE_LIBPJSIP_OSS),y)
> +LIBPJSIP_CONF_OPTS += --disable-oss
> +endif
> +
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 04/17] libpjsip: add oss option
2017-11-11 9:38 ` Arnout Vandecappelle
@ 2017-11-13 15:04 ` Adam Duskett
0 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-13 15:04 UTC (permalink / raw)
To: buildroot
On Sat, Nov 11, 2017 at 4:38 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 10-11-17 21:20, Adam Duskett wrote:
>> Signed-off-by: Adam Duskett <aduskett@gmail.com>
>> ---
>> package/libpjsip/Config.in | 3 +++
>> package/libpjsip/libpjsip.mk | 5 ++++-
>> 2 files changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
>> index a289c90a92..0a6398d508 100644
>> --- a/package/libpjsip/Config.in
>> +++ b/package/libpjsip/Config.in
>> @@ -23,6 +23,9 @@ config BR2_PACKAGE_LIBPJSIP_ALSA
>> bool "alsa support"
>> select BR2_PACKAGE_ALSA_LIB
>>
>> +config BR2_PACKAGE_LIBPJSIP_OSS
>> + bool "OSS support"
>
> I don't think adding support for OSS is useful. OSS has been deprecated for,
> what, 10 years now?
>
You would be surprised how often it's used in embedded environments. :(
> Regards,
> Arnout
>
>> +
>> endif # BR2_PACKAGE_LIBPJSIP_SOUND
>>
>> endif # BR2_PACKAGE_LIBPJSIP
>> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
>> index f354cd3538..d02ca4e803 100644
>> --- a/package/libpjsip/libpjsip.mk
>> +++ b/package/libpjsip/libpjsip.mk
>> @@ -35,7 +35,6 @@ LIBPJSIP_CONF_OPTS = \
>> --disable-ilbc-codec \
>> --disable-libwebrtc \
>> --disable-opus \
>> - --disable-oss \
>> --disable-ext-sound \
>> --disable-g711-codec \
>> --disable-l16-codec \
>> @@ -75,4 +74,8 @@ ifeq ($(BR2_PACKAGE_LIBPJSIP_ALSA),y)
>> LIBPJSIP_DEPENDENCIES += alsa-lib
>> endif
>>
>> +ifneq ($(BR2_PACKAGE_LIBPJSIP_OSS),y)
>> +LIBPJSIP_CONF_OPTS += --disable-oss
>> +endif
>> +
>> $(eval $(autotools-package))
>>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 05/17] libpjsip: add portaudio option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (2 preceding siblings ...)
2017-11-10 20:20 ` [Buildroot] [NEXT 04/17] libpjsip: add oss option Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-11 9:31 ` Arnout Vandecappelle
2017-11-10 20:20 ` [Buildroot] [NEXT 06/17] libpjsip: enable video option Adam Duskett
` (12 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 4 ++++
package/libpjsip/libpjsip.mk | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 0a6398d508..e00a4a30b0 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -26,6 +26,10 @@ config BR2_PACKAGE_LIBPJSIP_ALSA
config BR2_PACKAGE_LIBPJSIP_OSS
bool "OSS support"
+config BR2_PACKAGE_LIBPJSIP_PORTAUDIO
+ bool "portaudio support"
+ select BR2_PACKAGE_PORTAUDIO
+
endif # BR2_PACKAGE_LIBPJSIP_SOUND
endif # BR2_PACKAGE_LIBPJSIP
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index d02ca4e803..774959d50b 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -78,4 +78,9 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_OSS),y)
LIBPJSIP_CONF_OPTS += --disable-oss
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_PORTAUDIO),y)
+LIBPJSIP_DEPENDENCIES += portaudio
+LIBPJSIP_CONF_OPTS += --with-external-pa
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 05/17] libpjsip: add portaudio option
2017-11-10 20:20 ` [Buildroot] [NEXT 05/17] libpjsip: add portaudio option Adam Duskett
@ 2017-11-11 9:31 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2017-11-11 9:31 UTC (permalink / raw)
To: buildroot
On 10-11-17 21:20, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/libpjsip/Config.in | 4 ++++
> package/libpjsip/libpjsip.mk | 5 +++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
> index 0a6398d508..e00a4a30b0 100644
> --- a/package/libpjsip/Config.in
> +++ b/package/libpjsip/Config.in
> @@ -26,6 +26,10 @@ config BR2_PACKAGE_LIBPJSIP_ALSA
> config BR2_PACKAGE_LIBPJSIP_OSS
> bool "OSS support"
>
> +config BR2_PACKAGE_LIBPJSIP_PORTAUDIO
> + bool "portaudio support"
> + select BR2_PACKAGE_PORTAUDIO
> +
> endif # BR2_PACKAGE_LIBPJSIP_SOUND
>
> endif # BR2_PACKAGE_LIBPJSIP
> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
> index d02ca4e803..774959d50b 100644
> --- a/package/libpjsip/libpjsip.mk
> +++ b/package/libpjsip/libpjsip.mk
> @@ -78,4 +78,9 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_OSS),y)
> LIBPJSIP_CONF_OPTS += --disable-oss
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBPJSIP_PORTAUDIO),y)
> +LIBPJSIP_DEPENDENCIES += portaudio
> +LIBPJSIP_CONF_OPTS += --with-external-pa
It his option is not selected, will it use an internal copy of portaudio? Do we
really want that?
Regards,
Arnout
> +endif
> +
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 06/17] libpjsip: enable video option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (3 preceding siblings ...)
2017-11-10 20:20 ` [Buildroot] [NEXT 05/17] libpjsip: add portaudio option Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-10 20:20 ` [Buildroot] [NEXT 07/17] libpjsip: add ffmpeg option Adam Duskett
` (11 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index e00a4a30b0..20b8568d52 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -32,6 +32,9 @@ config BR2_PACKAGE_LIBPJSIP_PORTAUDIO
endif # BR2_PACKAGE_LIBPJSIP_SOUND
+config BR2_PACKAGE_LIBPJSIP_VIDEO
+ bool "Enable video"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 774959d50b..f45d9d1caf 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -29,7 +29,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-speex-codec \
--disable-speex-aec \
--disable-resample \
- --disable-video \
--disable-opencore-amr \
--disable-g7221-codec \
--disable-ilbc-codec \
@@ -83,4 +82,8 @@ LIBPJSIP_DEPENDENCIES += portaudio
LIBPJSIP_CONF_OPTS += --with-external-pa
endif
+ifneq ($(BR2_PACKAGE_LIBPJSIP_VIDEO),y)
+LIBPJSIP_CONF_OPTS += --disable-video
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 07/17] libpjsip: add ffmpeg option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (4 preceding siblings ...)
2017-11-10 20:20 ` [Buildroot] [NEXT 06/17] libpjsip: enable video option Adam Duskett
@ 2017-11-10 20:20 ` Adam Duskett
2017-11-11 9:33 ` Arnout Vandecappelle
2017-11-10 20:21 ` [Buildroot] [NEXT 08/17] libpjsip: add v4l2 option Adam Duskett
` (10 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 11 +++++++++++
package/libpjsip/libpjsip.mk | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 20b8568d52..1ad7d77f2a 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -35,6 +35,17 @@ endif # BR2_PACKAGE_LIBPJSIP_SOUND
config BR2_PACKAGE_LIBPJSIP_VIDEO
bool "Enable video"
+if BR2_PACKAGE_LIBPJSIP_VIDEO
+
+config BR2_PACKAGE_LIBPJSIP_FFMPEG
+ bool "ffmpeg support"
+ depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
+ select BR2_PACKAGE_FFMPEG
+ help
+ Enable ffmpeg support
+
+endif # BR2_PACKAGE_LIBPJSIP_VIDEO
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index f45d9d1caf..5421789948 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -40,7 +40,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-g722-codec \
--disable-libsamplerate \
--disable-sdl \
- --disable-ffmpeg \
--disable-v4l2 \
--disable-openh264 \
--disable-libyuv \
@@ -86,4 +85,11 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_VIDEO),y)
LIBPJSIP_CONF_OPTS += --disable-video
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_FFMPEG),y)
+LIBPJSIP_DEPENDENCIES += ffmpeg
+LIBPJSIP_CONF_OPTS += --with-ffmpeg=$(STAGING_DIR)/usr/lib
+else
+LIBPJSIP_CONF_OPTS += --disable-ffmpeg
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 07/17] libpjsip: add ffmpeg option
2017-11-10 20:20 ` [Buildroot] [NEXT 07/17] libpjsip: add ffmpeg option Adam Duskett
@ 2017-11-11 9:33 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2017-11-11 9:33 UTC (permalink / raw)
To: buildroot
On 10-11-17 21:20, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/libpjsip/Config.in | 11 +++++++++++
> package/libpjsip/libpjsip.mk | 8 +++++++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
> index 20b8568d52..1ad7d77f2a 100644
> --- a/package/libpjsip/Config.in
> +++ b/package/libpjsip/Config.in
> @@ -35,6 +35,17 @@ endif # BR2_PACKAGE_LIBPJSIP_SOUND
> config BR2_PACKAGE_LIBPJSIP_VIDEO
> bool "Enable video"
>
> +if BR2_PACKAGE_LIBPJSIP_VIDEO
> +
> +config BR2_PACKAGE_LIBPJSIP_FFMPEG
> + bool "ffmpeg support"
> + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
> + select BR2_PACKAGE_FFMPEG
> + help
> + Enable ffmpeg support
> +
> +endif # BR2_PACKAGE_LIBPJSIP_VIDEO
> +
> endif # BR2_PACKAGE_LIBPJSIP
>
> comment "libpjsip needs a toolchain w/ C++, threads"
> diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
> index f45d9d1caf..5421789948 100644
> --- a/package/libpjsip/libpjsip.mk
> +++ b/package/libpjsip/libpjsip.mk
> @@ -40,7 +40,6 @@ LIBPJSIP_CONF_OPTS = \
> --disable-g722-codec \
> --disable-libsamplerate \
> --disable-sdl \
> - --disable-ffmpeg \
> --disable-v4l2 \
> --disable-openh264 \
> --disable-libyuv \
> @@ -86,4 +85,11 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_VIDEO),y)
> LIBPJSIP_CONF_OPTS += --disable-video
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBPJSIP_FFMPEG),y)
> +LIBPJSIP_DEPENDENCIES += ffmpeg
> +LIBPJSIP_CONF_OPTS += --with-ffmpeg=$(STAGING_DIR)/usr/lib
Why is this needed? This is the standard library search path so shouldn't be
needed. Also, normally it would be --with-ffmpeg=$(STAGING_DIR)/usr and
configure uses .../include for -I and .../lib for -L. Please add an explanation
in the commit log.
Regards,
Arnout
> +else
> +LIBPJSIP_CONF_OPTS += --disable-ffmpeg
> +endif
> +
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [NEXT 08/17] libpjsip: add v4l2 option
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (5 preceding siblings ...)
2017-11-10 20:20 ` [Buildroot] [NEXT 07/17] libpjsip: add ffmpeg option Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 09/17] libpjsip: add G.711 codec Adam Duskett
` (9 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 10 ++++++++++
package/libpjsip/libpjsip.mk | 7 ++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 1ad7d77f2a..0e21aa65a7 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -44,6 +44,16 @@ config BR2_PACKAGE_LIBPJSIP_FFMPEG
help
Enable ffmpeg support
+config BR2_PACKAGE_LIBPJSIP_V4L2
+ bool "V4L2 support"
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l -> media headers
+ select BR2_PACKAGE_LIBV4L
+ help
+ Enable Video4Linux2 support
+
+comment "v4l2 support needs headers >= 3.0"
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+
endif # BR2_PACKAGE_LIBPJSIP_VIDEO
endif # BR2_PACKAGE_LIBPJSIP
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 5421789948..ce0ae59acd 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -40,7 +40,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-g722-codec \
--disable-libsamplerate \
--disable-sdl \
- --disable-v4l2 \
--disable-openh264 \
--disable-libyuv \
--disable-ipp \
@@ -92,4 +91,10 @@ else
LIBPJSIP_CONF_OPTS += --disable-ffmpeg
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_V4L2),y)
+LIBPJSIP_DEPENDENCIES += libv4l
+else
+LIBPJSIP_CONF_OPTS += --disable-v4l2
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 09/17] libpjsip: add G.711 codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (6 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 08/17] libpjsip: add v4l2 option Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 10/17] libpjsip: add G.722 codec Adam Duskett
` (8 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
There is no enable-codecs in configure, so instead, disable them if
they aren't selected instead of enabling them if they are.
Add the internal codecs first, start with G.711.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 5 +++++
package/libpjsip/libpjsip.mk | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 0e21aa65a7..8ff8d12b4f 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -56,6 +56,11 @@ comment "v4l2 support needs headers >= 3.0"
endif # BR2_PACKAGE_LIBPJSIP_VIDEO
+comment "dependency-less codecs"
+
+config BR2_PACKAGE_LIBPJSIP_CODEC_G711
+ bool "G.711"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index ce0ae59acd..761a9c01b6 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -35,7 +35,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-libwebrtc \
--disable-opus \
--disable-ext-sound \
- --disable-g711-codec \
--disable-l16-codec \
--disable-g722-codec \
--disable-libsamplerate \
@@ -97,4 +96,13 @@ else
LIBPJSIP_CONF_OPTS += --disable-v4l2
endif
+# Codecs can only be disabled. If explictly enabled, the check is
+# omitted (but successful), and there is no configure trace "Checking
+# if [codec] codec is disabled...no". So we only explicitly disable it
+# and we do not explictly enable it, so we get the configure log in
+# both cases.
+ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G711),y)
+LIBPJSIP_CONF_OPTS += --disable-g711-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 10/17] libpjsip: add G.722 codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (7 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 09/17] libpjsip: add G.711 codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 11/17] libpjsip: add G.722.1 codec Adam Duskett
` (7 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 8ff8d12b4f..32dac9c1b3 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -61,6 +61,9 @@ comment "dependency-less codecs"
config BR2_PACKAGE_LIBPJSIP_CODEC_G711
bool "G.711"
+config BR2_PACKAGE_LIBPJSIP_CODEC_G722
+ bool "G.722"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 761a9c01b6..481a02e786 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -36,7 +36,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-opus \
--disable-ext-sound \
--disable-l16-codec \
- --disable-g722-codec \
--disable-libsamplerate \
--disable-sdl \
--disable-openh264 \
@@ -105,4 +104,8 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G711),y)
LIBPJSIP_CONF_OPTS += --disable-g711-codec
endif
+ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G722),y)
+LIBPJSIP_CONF_OPTS += --disable-g722-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 11/17] libpjsip: add G.722.1 codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (8 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 10/17] libpjsip: add G.722 codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 12/17] libpjsip: add ilbc codec Adam Duskett
` (6 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 32dac9c1b3..2eea1dc73b 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -64,6 +64,9 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_G711
config BR2_PACKAGE_LIBPJSIP_CODEC_G722
bool "G.722"
+config BR2_PACKAGE_LIBPJSIP_CODEC_G7221
+ bool "G.722.1"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 481a02e786..d3acb93483 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -30,7 +30,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-speex-aec \
--disable-resample \
--disable-opencore-amr \
- --disable-g7221-codec \
--disable-ilbc-codec \
--disable-libwebrtc \
--disable-opus \
@@ -108,4 +107,9 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G722),y)
LIBPJSIP_CONF_OPTS += --disable-g722-codec
endif
+# libpjsip can only use a bundled version of libg7221
+ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G7221),y)
+LIBPJSIP_CONF_OPTS += --disable-g7221-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 12/17] libpjsip: add ilbc codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (9 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 11/17] libpjsip: add G.722.1 codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 13/17] libpjsip: add L16 codec Adam Duskett
` (5 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 2eea1dc73b..97aaeb2322 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -67,6 +67,9 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_G722
config BR2_PACKAGE_LIBPJSIP_CODEC_G7221
bool "G.722.1"
+config BR2_PACKAGE_LIBPJSIP_CODEC_ILBC
+ bool "iLBC"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index d3acb93483..050904f9d7 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -30,7 +30,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-speex-aec \
--disable-resample \
--disable-opencore-amr \
- --disable-ilbc-codec \
--disable-libwebrtc \
--disable-opus \
--disable-ext-sound \
@@ -112,4 +111,9 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G7221),y)
LIBPJSIP_CONF_OPTS += --disable-g7221-codec
endif
+# libpjsip can only use a bundled version of libilbc
+ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_ILBC),y)
+LIBPJSIP_CONF_OPTS += --disable-ilbc-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 13/17] libpjsip: add L16 codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (10 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 12/17] libpjsip: add ilbc codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 14/17] libpjsip: add bcg729 codec Adam Duskett
` (4 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 3 +++
package/libpjsip/libpjsip.mk | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 97aaeb2322..884a88bd50 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -70,6 +70,9 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_G7221
config BR2_PACKAGE_LIBPJSIP_CODEC_ILBC
bool "iLBC"
+config BR2_PACKAGE_LIBPJSIP_CODEC_L16
+ bool "L16"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 050904f9d7..2da9a975bc 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -33,7 +33,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-libwebrtc \
--disable-opus \
--disable-ext-sound \
- --disable-l16-codec \
--disable-libsamplerate \
--disable-sdl \
--disable-openh264 \
@@ -116,4 +115,8 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_ILBC),y)
LIBPJSIP_CONF_OPTS += --disable-ilbc-codec
endif
+ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_L16),y)
+LIBPJSIP_CONF_OPTS += --disable-l16-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 14/17] libpjsip: add bcg729 codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (11 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 13/17] libpjsip: add L16 codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 15/17] libpjsip: add gsm codec Adam Duskett
` (3 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Now add codecs with external dependencies.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 5 +++++
package/libpjsip/libpjsip.mk | 8 ++++++++
2 files changed, 13 insertions(+)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 884a88bd50..171f34f9cd 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -73,6 +73,11 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_ILBC
config BR2_PACKAGE_LIBPJSIP_CODEC_L16
bool "L16"
+comment "Codecs with external dependencies"
+
+config BR2_PACKAGE_LIBPJSIP_CODEC_BCG729
+ bool "BCG729"
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 2da9a975bc..10c172d419 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -119,4 +119,12 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_L16),y)
LIBPJSIP_CONF_OPTS += --disable-l16-codec
endif
+# Codecs with external dependencies
+ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_BCG729),y)
+LIBPJSIP_DEPENDENCIES += bcg729
+LIBPJSIP_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr/lib
+else
+LIBPJSIP_CONF_OPTS += --disable-bcg729
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 15/17] libpjsip: add gsm codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (12 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 14/17] libpjsip: add bcg729 codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 16/17] libpjsip: add opus codec Adam Duskett
` (2 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 8 ++++++++
package/libpjsip/libpjsip.mk | 8 +++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 171f34f9cd..b58d013d49 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -78,6 +78,14 @@ comment "Codecs with external dependencies"
config BR2_PACKAGE_LIBPJSIP_CODEC_BCG729
bool "BCG729"
+config BR2_PACKAGE_LIBPJSIP_CODEC_GSM
+ bool "GSM"
+ depends on !BR2_STATIC_LIBS # libgsm
+ select BR2_PACKAGE_LIBGSM
+
+comment "GSM codec needs a toolchain w/ shared libraries"
+ depends on BR2_STATIC_LIBS
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 10c172d419..14795208b8 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \
CFLAGS="$(LIBPJSIP_CFLAGS)"
LIBPJSIP_CONF_OPTS = \
- --disable-gsm-codec \
--disable-speex-codec \
--disable-speex-aec \
--disable-resample \
@@ -127,4 +126,11 @@ else
LIBPJSIP_CONF_OPTS += --disable-bcg729
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_GSM),y)
+LIBPJSIP_DEPENDENCIES += libgsm
+LIBPJSIP_CONF_OPTS += --with-external-gsm
+else
+LIBPJSIP_CONF_OPTS += --disable-gsm-codec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 16/17] libpjsip: add opus codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (13 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 15/17] libpjsip: add gsm codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 20:21 ` [Buildroot] [NEXT 17/17] libpjsip: add speex codec Adam Duskett
2017-11-10 22:25 ` [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Luca Ceresoli
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 4 ++++
package/libpjsip/libpjsip.mk | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index b58d013d49..8cde5370ae 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -86,6 +86,10 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_GSM
comment "GSM codec needs a toolchain w/ shared libraries"
depends on BR2_STATIC_LIBS
+config BR2_PACKAGE_LIBPJSIP_CODEC_OPUS
+ bool "Opus"
+ select BR2_PACKAGE_OPUS
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index 14795208b8..c053d5e80b 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -30,7 +30,6 @@ LIBPJSIP_CONF_OPTS = \
--disable-resample \
--disable-opencore-amr \
--disable-libwebrtc \
- --disable-opus \
--disable-ext-sound \
--disable-libsamplerate \
--disable-sdl \
@@ -133,4 +132,10 @@ else
LIBPJSIP_CONF_OPTS += --disable-gsm-codec
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_OPUS),y)
+LIBPJSIP_DEPENDENCIES += opus
+else
+LIBPJSIP_CONF_OPTS += --disable-opus
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 17/17] libpjsip: add speex codec
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (14 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 16/17] libpjsip: add opus codec Adam Duskett
@ 2017-11-10 20:21 ` Adam Duskett
2017-11-10 22:25 ` [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Luca Ceresoli
16 siblings, 0 replies; 25+ messages in thread
From: Adam Duskett @ 2017-11-10 20:21 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/libpjsip/Config.in | 4 ++++
package/libpjsip/libpjsip.mk | 9 +++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in
index 8cde5370ae..3e410d4f02 100644
--- a/package/libpjsip/Config.in
+++ b/package/libpjsip/Config.in
@@ -90,6 +90,10 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_OPUS
bool "Opus"
select BR2_PACKAGE_OPUS
+config BR2_PACKAGE_LIBPJSIP_CODEC_SPEEX
+ bool "Speex"
+ select BR2_PACKAGE_SPEEX
+
endif # BR2_PACKAGE_LIBPJSIP
comment "libpjsip needs a toolchain w/ C++, threads"
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index c053d5e80b..87339fd067 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -25,8 +25,6 @@ LIBPJSIP_CONF_ENV = \
CFLAGS="$(LIBPJSIP_CFLAGS)"
LIBPJSIP_CONF_OPTS = \
- --disable-speex-codec \
- --disable-speex-aec \
--disable-resample \
--disable-opencore-amr \
--disable-libwebrtc \
@@ -138,4 +136,11 @@ else
LIBPJSIP_CONF_OPTS += --disable-opus
endif
+ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_SPEEX),y)
+LIBPJSIP_DEPENDENCIES += speex
+LIBPJSIP_CONF_OPTS += --with-external-speex
+else
+LIBPJSIP_CONF_OPTS += --disable-speex-codec --disable-speex-aec
+endif
+
$(eval $(autotools-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options
2017-11-10 20:20 [Buildroot] [NEXT 01/17] libpjsip: remove deprecated config options Adam Duskett
` (15 preceding siblings ...)
2017-11-10 20:21 ` [Buildroot] [NEXT 17/17] libpjsip: add speex codec Adam Duskett
@ 2017-11-10 22:25 ` Luca Ceresoli
16 siblings, 0 replies; 25+ messages in thread
From: Luca Ceresoli @ 2017-11-10 22:25 UTC (permalink / raw)
To: buildroot
Hi,
On 10/11/2017 21:20, Adam Duskett wrote:
> disable-small-filter and disable-large-filter have been depricated as
deprecated
> of 2.7, causing messages during compile time complaining about how they
> are deprecated and have no effect.
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
With the typo fixed:
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
--
Luca
^ permalink raw reply [flat|nested] 25+ messages in thread