From 3603a0b384500a62328b406b2f10436f0db608e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 1 Mar 2022 23:56:12 +0100 Subject: [PATCH] vlc: upgrade 3.0.12 -> 3.0.17-1 to fix build with ffmpeg5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Tarballs are not (yet) avaliable -> get sources from git * bison-native is required for yacc conversion * yacc conversion is a not easy to read and not prepared for out of tree build To get around, use autotools-brokensep Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../vlc/{vlc_3.0.12.bb => vlc_3.0.17-1.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.12.bb => vlc_3.0.17-1.bb} (94%) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb similarity index 94% rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb index fde7b04335..2e3eb3e245 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb @@ -5,7 +5,7 @@ SECTION = "multimedia" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-native \ dbus libxml2 gnutls \ tremor faad2 ffmpeg flac alsa-lib \ lua-native lua libidn \ @@ -16,17 +16,17 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ LDFLAGS:append:riscv64 = " -latomic" LDFLAGS:append:riscv32 = " -latomic" -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ +SRC_URI = "git://github.com/videolan/vlc.git;protocol=https;branch=3.0.x \ file://0001-make-opencv-configurable.patch \ file://0002-use-vorbisidec.patch \ file://0003-fix-luaL-checkint.patch \ file://0004-Use-packageconfig-to-detect-mmal-support.patch \ file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ - file://0001-include-limits-header.patch \ " -SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879" +SRCREV = "aa76328c572d93f1d99c867a94ecad1dc3259733" +S = "${WORKDIR}/git" -inherit autotools features_check gettext pkgconfig mime-xdg +inherit autotools-brokensep features_check gettext pkgconfig mime-xdg REQUIRED_DISTRO_FEATURES = "x11"