Commit Graph

46 Commits

Author SHA1 Message Date
Baruch Siach
7ee766369c vlc: allow dynamically linking live555
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-19 10:02:43 +01:00
Baruch Siach
44d15563c7 live555: use upstream install target for staging installation
Move include directories out of $(STAGING_DIR)/usr/include/live. This is
upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to
match.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-18 23:08:04 +01:00
Jerzy Grzegorek
1769933d98 package: indentation cleanup
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-26 05:47:05 +01:00
Bernd Kuhls
f89d90d605 package/vlc: Fix typo
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-12 17:49:17 +02:00
Thomas Petazzoni
4b0946ad07 vlc: fix build when Qt4 development files are installed on the host
When Qt4 development files are installed on the host, VLC uses
/usr/bin/moc, /usr/bin/uic and /usr/bin/rcc when Qt support is
enabled. However, those host installed versions are not necessarily
compatible with the Qt version used in Buildroot, causes some build
failures.

This commit therefore passes explicit ac_cv_path_MOC, ac_cv_path_RCC
and ac_cv_path_UIC variables to make sure the Qt host tools built by
Buildroot are used.

Note that the VLC configure.ac script uses 'pkg-config
--variable=exec_prefix QtCore' to find the location of such tools, but
this invocation returns /usr. One solution would have been to extend
the pkgconf-01-fix-variable.patch we have against pkgconf to also
cover exec_prefix, but this has more uncertain consequences than just
fixing VLC.

Fixes:

  http://autobuild.buildroot.org/results/061/06174eaeb7f2b8a591395e607912ad72623b79e3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-10 23:57:45 +02:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Bernd Kuhls
0f57fcb91b package/ffmpeg: Bump version to 2.4
Version 2.3 is unmaintained:
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/183038

- removed ffmpeg-0002-bfin.patch, applied upstream
- added vlc-0004-libav.patch from upstream to fix VLC compilation

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 21:18:02 +02:00
Bernd Kuhls
7f4075f7de package/vlc: Disable broken linking of vlc-static
- vlc-0001-vlc-static.patch disables linking of bin/vlc-static
- remove vlc-0001-fix-link-error.patch as it should have fixed
  vlc-static, this patch is not needed anymore

Fixes
http://autobuild.buildroot.net/results/acc/acc212dc70abbf86be5d764895ee50b1eb64668f/
http://autobuild.buildroot.net/results/830/83025b9072221f9edaa4638687950f8086e1c19d/
http://autobuild.buildroot.net/results/0b5/0b59e2d0b17501d10c005292a2e1916f23a12a0e/
http://autobuild.buildroot.net/results/473/473e601b009d8b045cd6041f3725e9dc81e31f03/
http://autobuild.buildroot.net/results/3b2/3b2815d27a2252a2d677eed5c479a88bbb04d655/
http://autobuild.buildroot.net/results/022/022252176c051ff3365b2cb820f32aafc802803a/
http://autobuild.buildroot.net/results/2db/2dbaa3603b3dab9e06a37993fb235d009bd22df9/
http://autobuild.buildroot.net/results/0d4/0d4199c3271bbd7cf8a04403c5dafa1178f75fb1/
http://autobuild.buildroot.net/results/cb8/cb8402fc994697f157348d88f848357ca21156a4/
http://autobuild.buildroot.net/results/666/6660453c78d1557b645e8fd5b3ed2076e64fc91a/
http://autobuild.buildroot.net/results/2b9/2b9bbeea4a4b2953b445f54b5ce1b2d8f520451d/
http://autobuild.buildroot.net/results/7ff/7ff072f9b7487fb27070c58053dbcf96b7dd7a56/
http://autobuild.buildroot.net/results/ab1/ab1feef329c9da6cd3a4df46b6724030159a4003/
http://autobuild.buildroot.net/results/bd3/bd3a1bc0c6f333836c1888d8404832de948df739/
http://autobuild.buildroot.net/results/f70/f708306808953a48f8cc870d13be0e62ed2ece2e/
http://autobuild.buildroot.net/results/3c5/3c53f6e0f3c0367b760bbf2140acdb06b2b50223/
http://autobuild.buildroot.net/results/080/080fab04cd252f765dd197c9941470bfdf6ba629/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-04 09:46:06 +02:00
Bernd Kuhls
e128a5015d package/vlc: Bump version to 2.1.5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-03 10:20:21 +02:00
Gustavo Zacarias
162520241b vlc: security bump to version 2.1.4
Fixes CVE-2014-1684: The ASF_ReadObject_file_properties function in
modules/demux/asf/libasf.c in the ASF Demuxer in VideoLAN VLC Media
Player before 2.1.3 allows remote attackers to cause a denial of service
(divide-by-zero error and crash) via a zero minimum and maximum data
packet size in an ASF file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-18 13:55:57 +02:00
Cody P Schafer
40e58dab0c powerpc: add BR2_POWERPC_CPU_HAS_ALTIVEC to replace adhoc deps/checks
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-26 21:14:08 +02:00
Yann E. MORIN
b12f0a0590 package/vlc: depends on the virtual package libgl
Currently, vlc depends on mesa3d to provide the openGL support.

We now have a virtual package, libgl, which ensures openGL is available.

This is support for full OpenGL, which is only available when X.Org is
enabled, which is anyway a dependency of full OpenGL.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-17 23:00:48 +02:00
Vicente Olivert Riera
34df9c717a vlc: select libvorbis when opus is also selected
If BR2_PACKAGE_OPUS is selected then vlc will be built with support for
opus passing "--enable-opus" option to the configure script. But when
the configure script checks for the opus library it also checks for the
ogg library at the same time, so if only opus has been installed and not
ogg, then it will fail with an error message like this one:

checking for OPUS... no
configure: error: Library ogg opus needed for opus was not found

Fixes:
   http://autobuild.buildroot.net/results/4da/4da8e7cfb35c351e5d623835118512248d331d16/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-14 20:53:56 +02:00
Peter Korsgaard
de60501f63 vlc: use @buildroot.org for the mailing list
Now that @buildroot.org is working, we should use it everywhere.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-18 09:11:09 +01:00
Samuel Martin
1f646d71e4 vlc: update opencv disabling flag
This patch completes the commit d7f13e500e
turning --{with,without}- options in --{enable,disable}- options.

Fixes:
  http://autobuild.buildroot.net/results/a34/a34abdcc92a6b2cf976760d66adf6c7572743bb4/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-07 22:37:24 +01:00
Arnout Vandecappelle
39a00df346 vlc: avoid that AUTORECONF renames configure's arguments
VLC defines two autoconf functions which are also defined by our own
pkg.m4 from pkgconf. Unfortunately, they are defined in a different way:
VLC adds --enable- options, but pkg.m4 adds --with- options. To make
sure we use VLC's definition, rename these two functions from
PKG_WITH_MODULES to VLC_PKG_WITH_MODULES and from PKG_HAVE_WITH_MODULES
to VLC_PKG_HAVE_WITH_MODULES.

Note that the second function (PKG_HAVE_WITH_MODULES) is in fact
defined in exactly the same way by VLC and pkgconf, but this might no
longer be the case when either pkgconf or VLC is updated. Therefore,
that one is renamed as well.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-01 14:53:19 +01:00
Thomas Petazzoni
d7f13e500e Revert "vlc: fix some configure options"
This reverts commit 020047730b.

The change of configuration option from --{enable,disable}-* to
--{with,without} was made because we autoreconf vlc, but some vlc m4
functions are overriden by functions coming from our pkg.m4. An
upcoming patch from Arnout fixes the problem in a better way by
renaming the problematic macro so that they have a different name
between their vlc specific variants and the pkg.m4 variants.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-01 14:51:49 +01:00
Peter Korsgaard
b108fdcb83 Merge branch 'next'
Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-28 14:30:23 +01:00
Arnout Vandecappelle
132cf723ec vlc: add a patch to remove autoreconf warnings
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-27 15:31:54 +01:00
Arnout Vandecappelle
929f371cb0 vlc: fix shared library building
Fixes e.g.
http://autobuild.buildroot.net/results/9c7/9c7a97882d446a42cabcb07e4af7e6825192e70b

VLC cannot build static and shared libraries at the same time.

Also, live555 only has a static library, and VLC tries to link this into
a shared library. Therefore, disable the live555 plugin unless static
linking is selected. It would be better to build live555 as a shared
library, but that's for another patch.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-27 15:31:27 +01:00
Simon Dawson
020047730b 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.

Notice that this change of configure options is caused by our AUTORECONF
picking up a different PKG_WITH_MODULES definition.  If vlc is bumped in the
future and AUTORECONF is turned off, then this needs to be reverted.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-27 15:29:34 +01:00
Simon Dawson
666addf1bc vlc: needs toolchain with c++ support
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-26 13:17:44 +01:00
Arnout Vandecappelle
e33019aaa0 vlc: add warning that it has known issues
We've seen autobuilder failures for vlc on many platforms and we don't
know how to solve them. It is also currently orphaned, i.e. there is
nobody who is actively using the package and maintaining it in
buildroot.

We could mark the package as BROKEN, but that would make it completely
invisible for the users and the autobuilders, which would not help its
orphan-ness. Therefore, instead, add a big fat warning in the config
menus that it has known issues.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-25 22:45:50 +01:00
Samuel Martin
8e63d54e2a vlc: explicitly disable opencv support
vlc can use opencv in video filters, but it requires a couple of
features enabled in opencv; so, simply force disabling opencv support.

Note that vlc does includes the legacy opencv/cv.h header, which pulls a
number of opencv's features (core, video, imgproc, ...).

Fixes:
  http://autobuild.buildroot.org/results/39c/39c77ffb5a5599d0b09422433c747b2bac185c4f/
  http://autobuild.buildroot.org/results/a79/a79b055da09e4d8ede263251df8461bc8a64569a/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-17 09:02:19 +01:00
Thomas De Schampheleire
c72cb08cb1 vlc: needs dependency on host-lua if Lua is selected
If Lua support is requested in VLC, its configure script tries to find the
luac byte compiler, which fails if host-lua is not yet built.

This can be easily reproduced by setting a minimal config with vlc and Lua
enabled, and running: 'make clean toolchain vlc'. Final output is:

checking for LUA... no
configure: WARNING: Package lua5.2 was not found in the pkg-config search path.
Perhaps you should add the directory containing `lua5.2.pc'
to the PKG_CONFIG_PATH environment variable
No package 'lua5.2' found, trying lua 5.1 instead
checking for LUA... no
configure: WARNING: Package lua5.1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `lua5.1.pc'
to the PKG_CONFIG_PATH environment variable
No package 'lua5.1' found, trying lua >= 5.1 instead
checking for LUA... yes
checking for luac... no
configure: error: Could not find the LUA byte compiler.
make: *** [<buildroot>/output/build/vlc-2.1.2/.stamp_configured] Error 1

Fix this problem by setting host-lua as a dependency to vlc.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-16 21:02:34 +01:00
eric.le.bihan.dev@free.fr
fabcb119b9 udev: convert to virtual package
This patch converts udev to a virtual package. For the moment, there is only
one provider for the udev features: eudev.

Packages meant to provide udev-like features must select the symbol
BR2_PACKAGE_HAS_UDEV.

Packages depending on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV or
BR2_PACKAGE_UDEV have been converted to use the new symbol.

[Peter: move legacy symbols under 2014.05]
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-12 22:14:19 +01:00
Samuel Martin
a7c1b84a59 vlc: fix typo when setting VLC_CONF_ENV
Fixes:
  http://autobuild.buildroot.org/results/917/917c26656557d50f869639162ec7e9d0f3399824/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-09 16:42:12 +01:00
Samuel Martin
4b79dfc94e vlc: fix glx support
glx support is provided by the mesa3d package; so, enable it only when
mesa3d is part of the package selection.

Fixes:
  http://autobuild.buildroot.org/results/9b4/9b46021ea0064850ce8f1adcb5455d6da5bff459/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-09 16:41:24 +01:00
Samuel Martin
8c2534c50c vlc: enable altivec support only when appropriate
All PowerPC CPUs do not support altivec instruction set; so enable its
support only when the sub-architecture support it.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:09:42 +01:00
Samuel Martin
35667caad8 vlc: fix sdl support
sdl 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

[Peter: check for SDL X11 backend instead]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:09:19 +01:00
Samuel Martin
dace28c732 vlc: fix libgcrypt support
This 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

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:05:22 +01:00
Samuel Martin
833bc901d6 vlc: fix live555 support
vlc 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

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:04:16 +01:00
Samuel Martin
efa9a3f25e vlc: fix bonjour support
bonjour support checks for avahi-client, which requires avahi-daemon and
dbus enabled.

Fixes:
  http://autobuild.buildroot.org/results/f8b/f8bed9a42f1853db8aa81161d7be5a7cb67afe8f/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:03:09 +01:00
Samuel Martin
4d58ca1b48 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

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 22:02:59 +01:00
Jeremy Rosen
cd3de018d7 VLC needs QT_GUI_MODULE and not just QT
fixes http://autobuild.buildroot.net/results/78d/78df2d86394d7637db88dac5d1e3c7b4a27af293/

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-04 15:25:21 +01:00
Simon Dawson
e7d309cba0 vlc: add libass support
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-29 10:50:54 +01:00
Peter Korsgaard
67e4407b9f vlc: correct sdl_image dependency name
Fixes http://autobuild.buildroot.net/results/7e8/7e85b79612a46df2eee0278703f54d872da72ed5/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-21 07:29:09 +01:00
Simon Dawson
96b7f4e9a9 vlc: add udev support
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-16 09:19:35 +01:00
Simon Dawson
7284399e55 vlc: add libmodplug support
Commit 0a5d524015 added a libmodplug package
to Buildroot; this means that libmodplug support can now be enabled for the
vlc package.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-16 09:15:35 +01:00
Peter Korsgaard
373d6f385e vlc: correct libtheora dependency name
Fixes http://autobuild.buildroot.net/results/7b5/7b5387fa4e50036b7db407bf6ce866156bafcfdd/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-14 10:57:50 +01:00
Peter Korsgaard
e3c88d8fcd vlc: needs host-pkgconf
The configure script uses PKG_CHECK_MODULES to detect dependencies.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-13 13:32:42 +01:00
Simon Dawson
ab5bdc09d2 vlc: new package
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-12 21:18:01 +01:00
Peter Korsgaard
50f2a3981f mplayer, vlc: move into multimedia category
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
2008-11-15 21:33:14 +00:00
Peter Korsgaard
02a623ddf9 buildroot: remove trailing spaces
for i in `find -name 'Config*' -o -name 'Makefile*' -o -name '*.mk'`;
do
	sed -i 's/ \+$//' $i;
done
2008-08-04 19:07:05 +00:00
Peter Korsgaard
4683420c4c Kconfig: remove 'default n'
'default n' is the default, so there's no need to say it explicitly.
2008-07-17 20:01:44 +00:00
John Voltz
83096989f9 add libiconv and framework for vlc 2008-04-24 18:35:44 +00:00