Skip to contentSkip to conversation

vlc: fix some configure options

PATCH New Simon Dawson 5 participants 10 messages Feb 25, 2014 – Feb 27, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vlc: fix some configure options

Fix a large number of incorrect configure options for vlc.

Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

---
 package/vlc/vlc.mk | 70 +++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)
package/vlc/vlc.mk +35 -35
index 0e76e11..9bcedd1 100644
@@ -14,23 +14,23 @@ VLC_AUTORECONF = YES
 
 VLC_CONF_OPT += \
 	--disable-a52 \
-	--disable-shout \
-	--disable-twolame \
-	--disable-dca \
-	--disable-dirac \
-	--disable-schroedinger \
-	--disable-quicksync \
-	--disable-fluidsynth \
+	--without-shout \
+	--without-twolame \
+	--without-dca \
+	--without-dirac \
+	--without-schroedinger \
+	--without-quicksync \
+	--without-fluidsynth \
 	--disable-zvbi \
-	--disable-kate \
-	--disable-caca \
+	--without-kate \
+	--without-caca \
 	--disable-jack \
-	--disable-samplerate \
-	--disable-chromaprint \
-	--disable-goom \
+	--without-samplerate \
+	--without-chromaprint \
+	--without-goom \
 	--disable-projectm \
 	--disable-vsxu \
-	--disable-mtp \
+	--without-mtp \
 	--without-opencv
 
 # Set powerpc altivec appropriately
@@ -49,10 +49,10 @@ endif
 
 # bonjour support needs avahi-client, which needs avahi-daemon and dbus
 ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
-VLC_CONF_OPT += --enable-bonjour
+VLC_CONF_OPT += --with-bonjour
 VLC_DEPENDENCIES += avahi dbus
 else
-VLC_CONF_OPT += --disable-bonjour
+VLC_CONF_OPT += --without-bonjour
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
@@ -96,10 +96,10 @@ VLC_CONF_OPT += --disable-swscale
 endif
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
-VLC_CONF_OPT += --enable-flac
+VLC_CONF_OPT += --with-flac
 VLC_DEPENDENCIES += flac
 else
-VLC_CONF_OPT += --disable-flac
+VLC_CONF_OPT += --without-flac
 endif
 
 ifeq ($(BR2_PACKAGE_MESA3D),y)
@@ -110,10 +110,10 @@ VLC_CONF_OPT += --disable-glx
 endif
 
 ifeq ($(BR2_PACKAGE_OPUS),y)
-VLC_CONF_OPT += --enable-opus
+VLC_CONF_OPT += --with-opus
 VLC_DEPENDENCIES += opus
 else
-VLC_CONF_OPT += --disable-opus
+VLC_CONF_OPT += --without-opus
 endif
 
 ifeq ($(BR2_PACKAGE_LIBASS),y)
@@ -147,10 +147,10 @@ VLC_CONF_OPT += --disable-mod
 endif
 
 ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
-VLC_CONF_OPT += --enable-libmpeg2
+VLC_CONF_OPT += --with-libmpeg2
 VLC_DEPENDENCIES += libmpeg2
 else
-VLC_CONF_OPT += --disable-libmpeg2
+VLC_CONF_OPT += --without-libmpeg2
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
@@ -161,31 +161,31 @@ VLC_CONF_OPT += --disable-png
 endif
 
 ifeq ($(BR2_PACKAGE_LIBRSVG),y)
-VLC_CONF_OPT += --enable-svg
+VLC_CONF_OPT += --with-svg
 VLC_DEPENDENCIES += librsvg
 else
-VLC_CONF_OPT += --disable-svg
+VLC_CONF_OPT += --without-svg
 endif
 
 ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
-VLC_CONF_OPT += --enable-theora
+VLC_CONF_OPT += --with-theora
 VLC_DEPENDENCIES += libtheora
 else
-VLC_CONF_OPT += --disable-theora
+VLC_CONF_OPT += --without-theora
 endif
 
 ifeq ($(BR2_PACKAGE_LIBUPNP),y)
-VLC_CONF_OPT += --enable-upnp
+VLC_CONF_OPT += --with-upnp
 VLC_DEPENDENCIES += libupnp
 else
-VLC_CONF_OPT += --disable-upnp
+VLC_CONF_OPT += --without-upnp
 endif
 
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
-VLC_CONF_OPT += --enable-vorbis
+VLC_CONF_OPT += --with-vorbis
 VLC_DEPENDENCIES += libvorbis
 else
-VLC_CONF_OPT += --disable-vorbis
+VLC_CONF_OPT += --without-vorbis
 endif
 
 ifeq ($(BR2_PACKAGE_LIBV4L),y)
@@ -203,10 +203,10 @@ VLC_CONF_OPT += --disable-xcb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
-VLC_CONF_OPT += --enable-libxml2
+VLC_CONF_OPT += --with-libxml2
 VLC_DEPENDENCIES += libxml2
 else
-VLC_CONF_OPT += --disable-libxml2
+VLC_CONF_OPT += --without-libxml2
 endif
 
 ifeq ($(BR2_PACKAGE_LIVE555),y)
@@ -254,10 +254,10 @@ VLC_CONF_OPT += --disable-sdl-image
 endif
 
 ifeq ($(BR2_PACKAGE_SPEEX),y)
-VLC_CONF_OPT += --enable-speex
+VLC_CONF_OPT += --with-speex
 VLC_DEPENDENCIES += speex
 else
-VLC_CONF_OPT += --disable-speex
+VLC_CONF_OPT += --without-speex
 endif
 
 ifeq ($(BR2_PACKAGE_TREMOR),y)
@@ -268,10 +268,10 @@ VLC_CONF_OPT += --disable-tremor
 endif
 
 ifeq ($(BR2_PACKAGE_UDEV),y)
-VLC_CONF_OPT += --enable-udev
+VLC_CONF_OPT += --with-udev
 VLC_DEPENDENCIES += udev
 else
-VLC_CONF_OPT += --disable-udev
+VLC_CONF_OPT += --without-udev
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 vlc: fix some configure options

Hi Simon,

Quoted 4 lines · Simon Dawson

Fix a large number of incorrect configure options for vlc.

Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

Don't forget your SoB line ;)

Regards,

Signature · 1 line
Samuel
#2 lore raw

PATCH 1/1 vlc: fix some configure options

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Samuel" == Samuel Martin <[email protected]> writes:

Hi Simon,

Quoted 4 lines · Simon Dawson

Fix a large number of incorrect configure options for vlc.

Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

Don't forget your SoB line ;)

Simon, can I add it when I commit?

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 vlc: fix some configure options

In reply to Simon Dawson
Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Simon" == Simon Dawson <[email protected]> writes:

Fix a large number of incorrect configure options for vlc. Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

---
 package/vlc/vlc.mk | 70 +++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)
package/vlc/vlc.mk +0 -4
index 0e76e11..9bcedd1 100644
@@ -14,23 +14,23 @@ VLC_AUTORECONF = YES
 
 VLC_CONF_OPT += \
 	--disable-a52 \
-	--disable-shout \
-	--disable-twolame \
-	--disable-dca \
-	--disable-dirac \

package/vlc/vlc.mk VLC_AUTORECONF = YES · line 23

Quoted 10 lines
package/vlc/vlc.mk +7 -3
-	--disable-schroedinger \
-	--disable-quicksync \
-	--disable-fluidsynth \
+	--without-shout \
+	--without-twolame \
+	--without-dca \
+	--without-dirac \
+	--without-schroedinger \
+	--without-quicksync \
+	--without-fluidsynth \

Did you test these?

From a quick look:

./configure --help | egrep 'a52|shout|twolame|dca|dirac|schroedinger|quicksync|fluidsynth'

  --enable-shout          libshout output plugin [default=auto]
  --enable-twolame        MPEG Audio Layer 2 encoder [default=auto]
  --enable-a52            A/52 support with liba52 (default enabled)
  --with-a52=PATH         a52 headers and libraries
  --with-a52-tree=PATH    a52dec tree for static linking
  --enable-dca            DTS Coherent Acoustics support with libdca
  --enable-dirac          dirac encoder [default=auto]
  --enable-schroedinger   dirac decoder and encoder using schroedinger
  --enable-quicksync      Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262)
  --enable-fluidsynth     MIDI synthetiser with libfluidsynth [default=auto]

So they all seem to be of the --enable / --disable form and not --with / --without.

package/vlc/vlc.mk VLC_AUTORECONF = YES · line 30

Quoted 12 lines
package/vlc/vlc.mk +5 -5
 	--disable-zvbi \
-	--disable-kate \
-	--disable-caca \
+	--without-kate \
+	--without-caca \
 	--disable-jack \
-	--disable-samplerate \
-	--disable-chromaprint \
-	--disable-goom \
+	--without-samplerate \
+	--without-chromaprint \
+	--without-goom \

Same here:

./configure --help | egrep 'kate|caca|samplerate|chromaprint|goom'

  --enable-kate           kate codec [default=auto]
  --enable-caca           libcaca output [default=auto]
  --enable-samplerate     Resampler with libsamplerate [default=auto]
  --enable-chromaprint    (Chromaprint based audio fingerprinter)
  --enable-goom           goom visualization plugin [default=auto]

package/vlc/vlc.mk VLC_AUTORECONF = YES · line 34

Quoted 5 lines
package/vlc/vlc.mk +1 -1
 	--disable-projectm \
 	--disable-vsxu \
-	--disable-mtp \
+	--without-mtp \
 	--without-opencv

And here:

./configure --help | egrep 'mtp'
--enable-mtp MTP devices support [default=auto]

package/vlc/vlc.mk endif · line 55

Quoted 11 lines
package/vlc/vlc.mk +2 -2
 # Set powerpc altivec appropriately
@@ -49,10 +49,10 @@ endif
 
 # bonjour support needs avahi-client, which needs avahi-daemon and dbus
 ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
-VLC_CONF_OPT += --enable-bonjour
+VLC_CONF_OPT += --with-bonjour
 VLC_DEPENDENCIES += avahi dbus
 else
-VLC_CONF_OPT += --disable-bonjour
+VLC_CONF_OPT += --without-bonjour

./configure --help | egrep 'bonjour'
--enable-bonjour Bonjour services discovery [default=auto]

Quoted 4 lines
package/vlc/vlc.mk +0 -0
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)

package/vlc/vlc.mk VLC_CONF_OPT += --disable-swscale · line 103

Quoted 10 lines
package/vlc/vlc.mk +2 -2
@@ -96,10 +96,10 @@ VLC_CONF_OPT += --disable-swscale
 endif
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
-VLC_CONF_OPT += --enable-flac
+VLC_CONF_OPT += --with-flac
 VLC_DEPENDENCIES += flac
 else
-VLC_CONF_OPT += --disable-flac
+VLC_CONF_OPT += --without-flac
 endif

./configure --help | egrep 'flac'
--enable-flac libflac decoder/encoder support [default=auto]

package/vlc/vlc.mk VLC_CONF_OPT += --disable-glx · line 117

Quoted 12 lines
package/vlc/vlc.mk +2 -2
 ifeq ($(BR2_PACKAGE_MESA3D),y)
@@ -110,10 +110,10 @@ VLC_CONF_OPT += --disable-glx
 endif
 
 ifeq ($(BR2_PACKAGE_OPUS),y)
-VLC_CONF_OPT += --enable-opus
+VLC_CONF_OPT += --with-opus
 VLC_DEPENDENCIES += opus
 else
-VLC_CONF_OPT += --disable-opus
+VLC_CONF_OPT += --without-opus
 endif

./configure --help | egrep 'opus'
--enable-opus Opus support [default=auto]

.. And so on. What's going on here?

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 vlc: fix some configure options

Quoted 50 lines
Quoted 23 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Simon" == Simon Dawson <[email protected]> writes:

Fix a large number of incorrect configure options for vlc. Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

---
package/vlc/vlc.mk | 70 +++++++++++++++++++++++++++---------------------------

1 file changed, 35 insertions(+), 35 deletions(-)
package/vlc/vlc.mk +0 -5
index 0e76e11..9bcedd1 100644
@@ -14,23 +14,23 @@ VLC_AUTORECONF = YES
 
 VLC_CONF_OPT += \
--disable-a52 \
-	--disable-shout \
-	--disable-twolame \
-	--disable-dca \
-	--disable-dirac \

package/vlc/vlc.mk VLC_AUTORECONF = YES · line 22

Quoted 10 lines
package/vlc/vlc.mk +7 -3
-	--disable-schroedinger \
-	--disable-quicksync \
-	--disable-fluidsynth \
+	--without-shout \
+	--without-twolame \
+	--without-dca \
+	--without-dirac \
+	--without-schroedinger \
+	--without-quicksync \
+	--without-fluidsynth \

Did you test these?

From a quick look:

./configure --help | egrep 'a52|shout|twolame|dca|dirac|schroedinger|quicksync|fluidsynth'

  --enable-shout          libshout output plugin [default=auto]
  --enable-twolame        MPEG Audio Layer 2 encoder [default=auto]
  --enable-a52            A/52 support with liba52 (default enabled)
  --with-a52=PATH         a52 headers and libraries
  --with-a52-tree=PATH    a52dec tree for static linking
  --enable-dca            DTS Coherent Acoustics support with libdca
  --enable-dirac          dirac encoder [default=auto]
  --enable-schroedinger   dirac decoder and encoder using schroedinger
  --enable-quicksync      Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262)
  --enable-fluidsynth     MIDI synthetiser with libfluidsynth [default=auto]
Quoted 1 line

So they all seem to be of the --enable / --disable form and not --with / --without.

Ahh, now I get it. Our autoreconf somehow converts all those --enable / --disable to --with / --without.

Anybody that has any idea why this is so? It quite unfortunate as we will have to change all of this back once we bump the vlc version and no longer need VLC_AUTORECONF = YES.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/1 vlc: fix some configure options

Hi Peter,

Quoted 1 line · Peter Korsgaard
Quoted 1 line

Did you test these?

Yes, I did.

Quoted 2 lines

Ahh, now I get it. Our autoreconf somehow converts all those --enable / --disable to --with / --without.

Yes, exactly so.

Quoted 3 lines

Anybody that has any idea why this is so? It quite unfortunate as we will have to change all of this back once we bump the vlc version and no longer need VLC_AUTORECONF = YES.

I haven't yet got to the bottom of how/why this is happening, I'm afraid.

Simon.

#7 lore raw

PATCH 1/1 vlc: fix some configure options

Quoted 10 lines · Simon Dawson

Hi Peter,

Quoted 1 line · Peter Korsgaard
Quoted 1 line

Did you test these?

Yes, I did.

Quoted 2 lines

Ahh, now I get it. Our autoreconf somehow converts all those --enable / --disable to --with / --without.

Quoted 7 lines

Yes, exactly so.

Quoted 3 lines

Anybody that has any idea why this is so? It quite unfortunate as we will have to change all of this back once we bump the vlc version and no longer need VLC_AUTORECONF = YES.

I haven't yet got to the bottom of how/why this is happening, I'm afraid.

There's a lot of strangeness caused by our AUTORECONF...

I guess it has something to do with all the warnings we get when
AUTORECONFing, since in m4/with_pkg.m4 I do see:

m4_case(def_arg,

            [yes],[m4_pushdef([with_without], [--disable-]with_arg)],
            [m4_pushdef([with_without],[--enable-]with_arg)])

AC_ARG_ENABLE(with_arg,

     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
    [AS_TR_SH([enable_]with_arg)=def_arg])

In other words, it registers an --enable option.

I guess that the PKG_CHECK_MODULES option implicitly enables a
--with-foo option as well, but doesn't mention it in the help text.

Regards,
Arnout

Quoted 8 lines

Simon.
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#8 lore raw

PATCH 1/1 vlc: fix some configure options

In reply to Peter Korsgaard
Quoted 50 lines · Peter Korsgaard
Quoted 49 lines
Quoted 23 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Simon" == Simon Dawson <[email protected]> writes:

Fix a large number of incorrect configure options for vlc. Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

---
package/vlc/vlc.mk | 70 +++++++++++++++++++++++++++---------------------------

1 file changed, 35 insertions(+), 35 deletions(-)
package/vlc/vlc.mk +0 -5
index 0e76e11..9bcedd1 100644
@@ -14,23 +14,23 @@ VLC_AUTORECONF = YES
 
 VLC_CONF_OPT += \
--disable-a52 \
-	--disable-shout \
-	--disable-twolame \
-	--disable-dca \
-	--disable-dirac \

package/vlc/vlc.mk VLC_AUTORECONF = YES · line 22

Quoted 10 lines
package/vlc/vlc.mk +7 -3
-	--disable-schroedinger \
-	--disable-quicksync \
-	--disable-fluidsynth \
+	--without-shout \
+	--without-twolame \
+	--without-dca \
+	--without-dirac \
+	--without-schroedinger \
+	--without-quicksync \
+	--without-fluidsynth \

Did you test these?

From a quick look:

./configure --help | egrep 'a52|shout|twolame|dca|dirac|schroedinger|quicksync|fluidsynth'

  --enable-shout          libshout output plugin [default=auto]
  --enable-twolame        MPEG Audio Layer 2 encoder [default=auto]
  --enable-a52            A/52 support with liba52 (default enabled)
  --with-a52=PATH         a52 headers and libraries
  --with-a52-tree=PATH    a52dec tree for static linking
  --enable-dca            DTS Coherent Acoustics support with libdca
  --enable-dirac          dirac encoder [default=auto]
  --enable-schroedinger   dirac decoder and encoder using schroedinger
  --enable-quicksync      Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262)
  --enable-fluidsynth     MIDI synthetiser with libfluidsynth [default=auto]
Quoted 8 lines
Quoted 1 line

So they all seem to be of the --enable / --disable form and not --with / --without.

Ahh, now I get it. Our autoreconf somehow converts all those --enable / --disable to --with / --without.

Anybody that has any idea why this is so? It quite unfortunate as we will have to change all of this back once we bump the vlc version and no longer need VLC_AUTORECONF = YES.

OK, I got it.

VLC defines their own version of PKG_WITH_MODULES in m4/with_pkg.m4.
However, our autoreconf takes the one from host/usr/share/aclocal/pkg.m4 (which comes from host-pkgconf). The two implementations are identical, except for replacing the enable/disable with with/without.

pkg-config itself currently doesn't have this macro, so it's not very
likely that VLC will use the "standard" one from pkgconf in the short term.

So I think it's OK to do this enable->with change, but adding a comment
that this changes when AUTORECONF is removed.

Regards,
Arnout

Signature · 6 lines
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#9 lore raw

PATCH 1/1 vlc: fix some configure options

In reply to Simon Dawson
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Simon" == Simon Dawson <[email protected]> writes:

Fix a large number of incorrect configure options for vlc. Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures.

Committed with the commit message extended to explain that this is caused by our autoreconfm thanks.

Signature · 1 line
Bye, Peter Korsgaard