Commit Graph

72 Commits

Author SHA1 Message Date
Waldemar Brodkorb
ba1dd18a49 vlc: workaround microblaze gcc internal compiler error
Override gcc optimization flags with -O0. The workaround is not required
for gcc6 anymore, so we take this into account into our condition.

Fixes:

  http://autobuild.buildroot.net/results/a318f0838a6a602046e719103ac81965c0084d52

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Thomas: add gcc 6.x condition.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-27 21:35:46 +01:00
Danomi Manchego
a3a2dbc409 packages: improve license type lists
Make license type lists more uniform:

* put content license applies to in parenthesis; ex: "GPLv2+ (programs)"
* use commas to separate types listed without conjuction; ex: "GPLv2, LGPLv2"

No attempt was made to validate the claimed licenses.  This is just a tweak
to increase uniformity of the _LICENSE variables.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Thomas: replace semi-colons by commas in LIBURCU_LICENSE.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-20 22:16:01 +01:00
Bernd Kuhls
03f6e005e6 package/vlc: use BR2_TOOLCHAIN_HAS_LIBATOMIC
While fixing
http://autobuild.buildroot.net/results/d95/d9572bcafc1776eebe88bbcaf031a05cd6ee4b23/
by using http://patchwork.ozlabs.org/patch/674337/ the build stopped at
a later stage with

/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_add_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_sub_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_or_1'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_compare_exchange_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_exchange_1'
collect2: error: ld returned 1 exit status

so libatomic must be pulled in if necessary.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-19 23:40:56 +02:00
Bernd Kuhls
bf586c6b6c package/vlc: bump version to 2.2.4
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-06-11 23:55:33 +02:00
Bernd Kuhls
79132c9e4a package/vlc: configure.ac does not support --en/--disable-freerdp
Vlc configure does not allow disabling the optional dependency to
freerdp:
http://git.videolan.org/?p=vlc/vlc-2.2.git;a=blob;f=configure.ac;h=e021546e284d7daefdb4d94f430eb0bc57722210;hb=HEAD#l1890

Vlc configure prints a warning that the option --disable-libfreerdp
is not used:

configure: WARNING: unrecognized options: --disable-gtk-doc,
 --disable-gtk-doc-html, --disable-doc, --disable-docs,
 --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6,
 --disable-libfreerdp

This can be seen for example in autobuilder logs:
http://autobuild.buildroot.net/results/1a7/1a7893c13f6144e0ecd9f37f2f047c596ccedd35/build-end.log

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-06-10 00:14:41 +02:00
Vicente Olivert Riera
8413f98999 vlc: bump version to 2.2.3
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-05-04 22:46:12 +02:00
Bernd Kuhls
59d0d2fcb4 package/vlc: add optional support for musepack
When musepack was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/demux/libmpc_plugin.so | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libintl.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [libmpcdec.so.7]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:02:37 +01:00
Bernd Kuhls
35c14879c7 package/vlc: add optional support for xcb-util-keysyms
When xcb-util-keysyms was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so | grep NEEDED | sort
[...]
 0x0000000000000001 (NEEDED)             Shared library: [libxcb-keysyms.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libxcb.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libXdmcp.so.6]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:02:30 +01:00
Bernd Kuhls
e51db776cb package/vlc: add optional support for minizip
When minizip was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/access/libzip_plugin.so | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libintl.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [libminizip.so.1]
[...]

The build system offers no option to en-/disable minizip support,
the same is valid for zlib support:
https://git.videolan.org/?p=vlc.git;a=blob;f=configure.ac;h=be658816bcda642090e1cff20d93e61b25299250;hb=HEAD#l831

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:02:15 +01:00
Bernd Kuhls
3daf6e19e0 package/vlc: add optional support for libssh2
When libssh2 was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/access/libsftp_plugin.so | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libvlccore.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libintl.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libm.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libssh2.so.1]
[...]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:02:05 +01:00
Bernd Kuhls
0cc322eede package/vlc: add optional support for libvncserver
When libvncserver was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/access/libvnc_plugin.so | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libvlccore.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libintl.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libvncclient.so.0]
[...]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:01:53 +01:00
Bernd Kuhls
ad14738863 package/vlc: add optional support for libcddb
When libcddb was compiled before, vlc will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/vlc/plugins/access/libcdda_plugin.so | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libcddb.so.2]
[...]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:01:45 +01:00
Bernd Kuhls
e1b34f00b4 package/vlc: bump version to 2.2.2
Removed two patches applied upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-05 15:00:26 +01:00
Bernd Kuhls
57ce16aa27 package/vlc: Add optional dependency to libbluray
libbluray is an optional dependency of vlc:
http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=configure.ac;h=d44151b3fb507141ce7f9b98e95fa11edcdaac01;hb=HEAD#l1739

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-13 22:16:10 +01:00
Bernd Kuhls
9bf68d30b8 package/vlc: Add optional dependency to zlib
zlib is an optional dependency of vlc:
http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=configure.ac;h=d44151b3fb507141ce7f9b98e95fa11edcdaac01;hb=HEAD#l811

Thanks to Yann for pointing this out:
http://patchwork.ozlabs.org/patch/529248/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-13 22:15:42 +01:00
Pieterjan Camerlynck
217171565f vlc: add optional dependency to libmatroska
libmatroska is an optional dependency to vlc:
http://git.videolan.org/?p=vlc.git;a=blob;f=configure.ac;h=c46120d7f2a7d49d68d488d617e071148b8c5595;hb=HEAD#l2044

Add it to vlc.mk to get reproducable builds.

Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-31 15:22:07 +01:00
Pieterjan Camerlynck
1c7239e36f vlc: add support for libdvbpsi
Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-30 23:29:30 +01:00
Bernd Kuhls
ebd1ce786a package/vlc: Add optional dependency to libtaglib
taglib is an optional dependency to vlc:
http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=configure.ac;h=b9bd76a829da8ee8b8ea69a141827abd87c47cb2;hb=HEAD#l4020

$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a
  output/target/usr/lib/vlc/plugins/meta_engine/libtaglib_plugin.so
  | grep NEEDED
 0x00000001 (NEEDED)                     Shared library: [libvlccore.so.8]
 0x00000001 (NEEDED)                     Shared library: [librt.so.1]
 0x00000001 (NEEDED)                     Shared library: [libpthread.so.1]
 0x00000001 (NEEDED)                     Shared library: [libdl.so.1]
 0x00000001 (NEEDED)                     Shared library: [libtag.so.1]
 0x00000001 (NEEDED)                     Shared library: [libz.so.1]
 0x00000001 (NEEDED)                     Shared library: [libstdc++.so.6]
 0x00000001 (NEEDED)                     Shared library: [libm.so.1]
 0x00000001 (NEEDED)                     Shared library: [libc.so.1]
 0x00000001 (NEEDED)                     Shared library: [libgcc_s.so.1]

Add it to vlc.mk to get reproducable builds.

For taglib itself zlib is only an optional dependency
http://git.buildroot.net/buildroot/tree/package/taglib/taglib.mk#n13

But taglib support in vlc depends on zlib:
http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=modules/meta_engine/Makefile.am;h=003d292cdc9a80762a6515e0ced77552f13b5120;hb=HEAD#l10
so we select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB is selected.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-12 22:01:17 +02:00
Joao Pinto
b4a81fc2c6 vlc: enable to run as root
A number of embedded systems only include the root user, so this patch
changes the VLC package so that running VLC as root is allowed, like
it is for all other Buildroot packages.

[Thomas: tweak commit log, remove incorrect Tested-by.]

Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-09-16 22:24:01 +02:00
Samuel Martin
644b856e4a package/vlc: update opencv support
vlc supports both opencv-2.4 and opencv-3, so adjust the vlc package to
reflect this.

Cc: Jonathan Ben Avraham <yba@tkos.co.il>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-08-25 11:57:36 +02:00
Samuel Martin
3ba8dc3561 package: rename opencv -> opencv3
Since there is a couple of API breaks between OpenCV 2.4 and 3.0, two
distinct packages mutually exclusive will be integrated in the package
tree.

So, this change prepares the re-introduction of the OpenCV-2.4 package
by renaming the current opencv package (which provides OpenCV-3.0) to
opencv3.

Reverse dependencies (vlc) is fixed to use the new symbols.

Cc: Jonathan Ben Avraham <yba@tkos.co.il>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr:
  - fix missed usage in vlc.mk
  - don't remove legacy OpenCV symbols
  - fix 'endif' comment
  - slightly reword commit log (reverse deps)
]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-08-25 11:51:35 +02:00
Bernd Kuhls
a865c6bd59 package/vlc: Fix SSE support with gcc5
Compile fails

make[4]: Entering directory `/home/fli4l/br6_freeswitch/output/build/vlc-2.2.1/modules'
  CC       video_chroma/libi420_yuy2_sse2_plugin_la-i420_yuy2.lo
In file included from video_chroma/i420_yuy2.c:35:0:
video_chroma/i420_yuy2.c: In function 'I420_UYVY_Filter':
video_chroma/i420_yuy2.c:194:23: error: calling 'I420_UYVY.isra.2' with SSE caling convention without SSE/SSE2 enabled
 VIDEO_FILTER_WRAPPER( I420_UYVY )
                       ^
../include/vlc_filter.h:266:13: note: in definition of macro 'VIDEO_FILTER_WRAPPER'
             name( p_filter, p_pic, p_outpic );                          \

using this defconfig

BR2_x86_pentium2=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_GCC_VERSION_5_1_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_VLC=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-06 17:50:57 +02:00
Samuel Martin
dbe9c5e204 package/vlc: add opencv support
This change adds 2 patches (backported from upstream) to vlc fixing the
build against opencv2 APIs.
This allows to select the minimal set of opencv modules when opencv
support is enabled.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-05 15:00:58 +02:00
Bernd Kuhls
b59567b38e package/vlc: Add libsidplay2 as optional dependency
vlc has a sid plugin:

$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a
  output/target/usr/lib/vlc/plugins/demux/libsid_plugin.so |
  grep NEEDED | grep sid
 0x00000001 (NEEDED)     Shared library: [libsidplay2.so.1]
 0x00000001 (NEEDED)     Shared library: [libresid-builder.so.0]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-06-28 22:56:14 +02:00
Romain Naour
45ea3228a1 package/vlc: install vlc libraries in staging
Although no package seems to link against vlc libraries right now, these
libraries will be necessary for upcoming new efl emotion-generic-players
package.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Acked-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-06-28 14:02:39 +02:00
Peter Korsgaard
ac95a7a27b vlc: ensure correct directfb-config is used
Otherwise we can end up using host includes/libraries if the build host has
directfb-config.

Fixes:
http://autobuild.buildroot.net/results/361/3612b54b0bbc2a55ba6f0febb7be32595b523d96/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-04 16:27:10 +02:00
Bernd Kuhls
dc9cbe5e03 package/vlc: bump version to 2.2.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:47:22 +02:00
Bernd Kuhls
40e6f3df17 package/vlc: use only glesv2, not glesv1
Fixes
http://autobuild.buildroot.net/results/0be/0bee8646c2dd7dd2c201ee2986f3e802277314a5/
http://autobuild.buildroot.net/results/64a/64a1a6d39b72b9dec4231b9f28ca14b38989d7df/
http://autobuild.buildroot.net/results/b6b/b6b66e0b24d985462ca8dbefedd740453ca42293/
http://autobuild.buildroot.net/results/497/4976f5e9dc53e6f9f29d9d45f0fb9bd42c7ab1ea/

and many others

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:47:11 +02:00
Yann E. MORIN
2e340beb61 package/vlc: bump to 2.2.0
Since we bumped FreeRDP, vlc no longer builds:
    http://autobuild.buildroot.org/results/8d9/8d91e3ffccee753135e9d0faa2b1ae00875606c9/
    http://autobuild.buildroot.org/results/e1f/e1f6526d1a4ac2c95998793efea2188faa708e29/

Fix that by bumping vlc to 2.2.0, as vlc-2.1.6will never support this
new version of FreeRDP.

Add dependency on kernel headers >= 3.7, because it needs DTV_STREAM_ID.
I stumbled on this whith a toolchain using headers forom 3.5, but only
tested with a toolchain with headers from 3.9, so there might be other
dependencies I missed on 3.8 or even 3.9. Let's wait for build failures
to find out...

There are quite a bunch of new --enable/disable options, so I've tried
to catter for all the changes. Most notably, there's no longer a flag to
enable.disable GL, it is now always auto-detected. Also, I've added
flags for GLES which we were missing so far, so we had to rely on the
build order to detect those dependencies (which was OK becasue libgles
sorts before vlc). Finally, SVG now has two flags to enable different
parts of SVG support, but they both depend on the same library, so
enable both.

There are new support for some features, like acceleration on RPI, but
that can well wait for further patches when someone is interested ;-) ,
vdpau HW accelearation on NVidia (we have a package for that, but not
able to test, so not added), vpx support (we have a libvpx package,
but I had no time to test), x262 and x265 support for which we're
currently lacking the packaging, and a few other exotic stuff...

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-06 12:24:47 +02:00
Yann E. MORIN
6fd087025f package/vlc: express the dependency on freerdp
vlc can use the freerdp library if present.

This is currently a hidden dependency, as we do not express it in our
vlc.mk rules. Package ordering makes it so that freerdp is built before
vlc; however, manually building vlc (with 'make vlc') would miss the
dependency because of that package ordering.

Explcitly add freerdp (if enabled) as a dependency of vlc to ensure
build order in every cases.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-04 23:23:34 +01:00
Gustavo Zacarias
9d13019edd vlc: security bump to version 2.1.6
* Fix heap overflow in decomp stream filter
* Fix buffer overflow in updater
* Fix potential buffer overflow in schroedinger encoder
* Fix null-pointer dereference in DMO decoder
* Fix buffer overflow in parsing of string boxes in mp4 demuxer
* Fix SRTP integer overflow
* Fix potential crash in zip access
* Fix read overflow in Ogg demuxer

And also add hash file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-27 17:13:57 +01:00
Bernd Kuhls
4f9de740fe package/vlc: Update SITE url
old SITE is now password-protected

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-20 15:53:09 +01:00
Thomas Petazzoni
665e13c85e Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.

As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.

This also helps preparing the addition of other options to select
shared, shared+static or just static.

Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-11 22:48:13 +01:00
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
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
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
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