vlc: fix build with libvorbis and tremor
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Tue, 16 Oct 2018 15:09:09 +0000 (17:09 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 17 Oct 2018 19:49:48 +0000 (21:49 +0200)
commitd440df6e0d7dfb5abe1b763b4b3479e029201872
tree4b20eeb2edfab33775f2172a599dc32702492cb2
parent22a6d1551a9ec54450d71b4a7042fbc39f3b15a1
vlc: fix build with libvorbis and tremor

Commit 550c42509c203891c47d934b058a19c2fa490973 "package/vlc: fix
linking with tremor" fixed build with BR2_PACKAGE_TREMOR and without
BR2_PACKAGE_LIBVORBIS. However, it breaks build if BR2_PACKAGE_TREMOR
and BR2_PACKAGE_LIBVORBIS are both enabled.
Indeed, by overiding VORBIS_LIBS by -lvorbisidec, link of
codec/.libs/libvorbis_plugin_la-vorbis.o with -lvorbis
failed because VORBIS_LIBS is normally used to save "-logg
-lvorbis -lvorbisenc":
PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorbis decoder and encoder], [auto])

So replace fourth patch by an upstreamable patch which uses pkg-config
to set TREMOR_LIBS if tremor is found instead of "hacking" VORBIS_LIBS

Fixes:
 - http://autobuild.buildroot.org/results/85a7bb1996b78dee037d5900b124cbdf5b66a6ac

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/vlc/0004-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch [deleted file]
package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch [new file with mode: 0644]
package/vlc/vlc.mk