vlc: autobuilder fixes
cover vlc: autobuilder fixes
All,
Here is a series that fixes a couple of aubuilder failures because of vlc.
Yours,
Samuel
Samuel Martin (6):
vlc: fix svg support
vlc: fix bonjour support
vlc: fix live555 support
vlc: fix libgcrypt support
vlc: fix sdl support
vlc: enable altivec support only when appropriate
...ac-add-check-for-libgcrypt-config-program.patch | 43 ++++++++++++++++++++++ package/vlc/vlc.mk | 32 +++++++++++++--- 2 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch
--
1.8.5.4
PATCH 1/6 vlc: fix svg support
In vlc, svg support is done using librsvg, not libsvg.
Fixes:
http://autobuild.buildroot.org/results/344/344af6e756a5f2c1ee515a355ae5b288401c4c71/build-end.log
http://autobuild.buildroot.org/results/19f/19f1450ed5453aa666bc7aae2e965ad81e5f845d/build-end.log
--- package/vlc/vlc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +2 -2
@@ -141,9 +141,9 @@ else VLC_CONF_OPT += --disable-png endif -ifeq ($(BR2_PACKAGE_LIBSVG),y) +ifeq ($(BR2_PACKAGE_LIBRSVG),y) VLC_CONF_OPT += --enable-svg -VLC_DEPENDENCIES += libsvg +VLC_DEPENDENCIES += librsvg else VLC_CONF_OPT += --disable-svg endif
Signature · 1 line
1.8.5.4
PATCH 2/6 vlc: fix bonjour support
In reply to Samuel Martinbonjour support checks for avahi-client, which requires avahi-daemon and dbus enabled.
Fixes:
http://autobuild.buildroot.org/results/f8b/f8bed9a42f1853db8aa81161d7be5a7cb67afe8f/build-end.log
--- package/vlc/vlc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +3 -2
@@ -38,9 +38,10 @@ else VLC_CONF_OPT += --disable-alsa endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# 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_DEPENDENCIES += avahi +VLC_DEPENDENCIES += avahi dbus else VLC_CONF_OPT += --disable-bonjour endif
Signature · 1 line
1.8.5.4
PATCH 3/6 vlc: fix live555 support
In reply to Samuel Martinvlc looks for a *.pc file which is not provided by the live555 package. So, instead, we explicitly set the LIVE555_CFLAGS and LIVE555_LIBS variables.
Fixes:
http://autobuild.buildroot.org/results/b59/b5972ecad4e5004dc23a2366066ce45346994f58/build-end.log
--- package/vlc/vlc.mk | 9 +++++++++ 1 file changed, 9 insertions(+)
package/vlc/vlc.mk +9 -0
@@ -194,6 +194,15 @@ endif ifeq ($(BR2_PACKAGE_LIVE555),y) VLC_CONF_OPT += --enable-live555 VLC_DEPENDENCIES += live555 +VLC_CONF_ENV = \ + LIVE555_CFLAGS="\ + -I$(STAGING_DIR)/usr/include/live \ + -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \ + -I$(STAGING_DIR)/usr/include/live/groupsock \ + -I$(STAGING_DIR)/usr/include/live/liveMedia \ + -I$(STAGING_DIR)/usr/include/live/UsageEnvironment \ + " \ + LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia" else VLC_CONF_OPT += --disable-live555 endif
Signature · 1 line
1.8.5.4
PATCH 4/6 vlc: fix libgcrypt support
In reply to Samuel MartinThis patch allows to override the libgcrypt-config location instead of using the one found in the PATH, which is usually the host system one.
Fixes:
http://autobuild.buildroot.org/results/5e4/5e42d1139bbbed2421193d8acc52df9442c43730/build-end.log
--- ...ac-add-check-for-libgcrypt-config-program.patch | 43 ++++++++++++++++++++++ package/vlc/vlc.mk | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch
package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Sat, 8 Feb 2014 14:33:27 +0100 +Subject: [PATCH] configure.ac: add check for libgcrypt-config program + +This allows to override the default libgcrypt-config location (which is +useful when cross-compiling), instead of using the one from the host +system. + +Signed-off-by: Samuel Martin <[email protected]> +--- + configure.ac | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02fb8aa..5a2267b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3943,16 +3943,17 @@ dnl + AC_ARG_ENABLE(libgcrypt, + [ --disable-libgcrypt gcrypt support (default enabled)]) + AS_IF([test "${enable_libgcrypt}" != "no"], [ ++ AC_PATH_PROG(GCRYPT_CONFIG,libgcrypt-config,libgcrypt-config) + AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ +- libgcrypt-config --version >/dev/null || \ ++ ${GCRYPT_CONFIG} --version >/dev/null || \ + AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) + AC_CHECK_LIB(gcrypt, gcry_control, [ + have_libgcrypt="yes" +- GCRYPT_CFLAGS="`libgcrypt-config --cflags`" +- GCRYPT_LIBS="`libgcrypt-config --libs`" ++ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`" ++ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`" + ], [ + AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) +- ], [`libgcrypt-config --libs`]) ++ ], [`${GCRYPT_CONFIG} --libs`]) + ], [ + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + ], [#include <gcrypt.h>] +-- +1.8.5.4 +
package/vlc/vlc.mk +3 -0
@@ -10,6 +10,7 @@ VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPLv2+ LGPLv2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_DEPENDENCIES = host-pkgconf +VLC_AUTORECONF = YES VLC_CONF_OPT += \ --disable-a52 \
@@ -110,6 +111,8 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) VLC_CONF_OPT += --enable-libgcrypt VLC_DEPENDENCIES += libgcrypt +VLC_CONF_ENV += \ + GCRYPT_CONFIG="$(STAGING_DIR)/usr/bin/libgcrypt-config" else VLC_CONF_OPT += --disable-libgcrypt endif
Signature · 1 line
1.8.5.4
PATCH 5/6 vlc: fix sdl support
In reply to Samuel Martinsdl video output module includes xlib headers, so it requires xlib_libx11 to be available.
Fixes:
http://autobuild.buildroot.org/results/d41/d41d2f36a4384289e300a3cf91d51960df9fab00/build-end.log
--- package/vlc/vlc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +2 -2
@@ -224,9 +224,9 @@ else VLC_CONF_OPT += --disable-qt endif -ifeq ($(BR2_PACKAGE_SDL),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_SDL),yy) VLC_CONF_OPT += --enable-sdl -VLC_DEPENDENCIES += sdl +VLC_DEPENDENCIES += sdl xlib_libX11 else VLC_CONF_OPT += --disable-sdl endif
Signature · 1 line
1.8.5.4
PATCH 5/6 vlc: fix sdl support
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
sdl video output module includes xlib headers, so it requires
xlib_libx11to be available.Fixes:
http://autobuild.buildroot.org/results/d41/d41d2f36a4384289e300a3cf91d51960df9fab00/build-end.logSigned-off-by Samuel Martin <[email protected]>--- package/vlc/vlc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/vlc/vlc.mk +0
-0
package/vlc/vlc.mk else · line 227
Quoted 5 lines
package/vlc/vlc.mk +1
-1@@ -224,9 +224,9 @@ else VLC_CONF_OPT += --disable-qt endif -ifeq ($(BR2_PACKAGE_SDL),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_SDL),yy)
A more correct test is probably for SDL's X11 backend (which also implies XLIB_LIBX11), so I've changed it to test for that.
Committed with that change, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/6 vlc: enable altivec support only when appropriate
In reply to Samuel MartinAll PowerPC CPUs do not support altivec instruction set; so enable its support only when the sub-architecture support it.
--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -32,6 +32,13 @@ VLC_CONF_OPT += \ --disable-vsxu \ --disable-mtp +# Set powerpc altivec appropriately +ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +VCL_CONF_OPT += --enable-altivec +else +VLC_CONF_OPT += --disable-altivec +endif + ifeq ($(BR2_PACKAGE_ALSA_LIB),y) VLC_CONF_OPT += --enable-alsa VLC_DEPENDENCIES += alsa-lib
Signature · 1 line
1.8.5.4
cover vlc: autobuilder fixes
In reply to Samuel MartinQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
All,
Here is a series that fixes a couple of aubuilder failures because of vlc.Yours,
Samuel
Quoted 7 lines
Samuel Martin (6):
vlc: fix svg support
vlc: fix bonjour support
vlc: fix live555 support
vlc: fix libgcrypt support
vlc: fix sdl support
vlc: enable altivec support only when appropriate
Committed series, thanks.
Signature · 1 line
Bye, Peter Korsgaard