aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-10-28 20:54:47 +0200
committerKhem Raj <raj.khem@gmail.com>2019-10-28 15:26:43 -0700
commitc986cbed9329aff1401acede425ffb0910512ad2 (patch)
tree05e697af8d6ce915c2ee216149d74b31d2c4069e /meta-multimedia
parent6608219c2473b15c2d7410a06a28bffd45ae8826 (diff)
downloadmeta-openembedded-c986cbed9329aff1401acede425ffb0910512ad2.tar.gz
vlc: Upgrade 3.0.6 -> 3.0.8
Workaround for riscv64 issue fixed upstream removed. Also merge the inc into the recipe. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb11
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb (renamed from meta-multimedia/recipes-multimedia/vlc/vlc.inc)8
2 files changed, 7 insertions, 12 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb
deleted file mode 100644
index fcd321cb0e..0000000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ${BPN}.inc
-
-LDFLAGS_append_riscv64 = " -pthread"
-
-SRC_URI += " \
- file://0006-make-opencv-configurable.patch \
- file://0007-use-vorbisidec.patch \
- file://0008-fix-luaL-checkint.patch \
-"
-SRC_URI[md5sum] = "4ff71d262e070fd19f86a1c3542c7b4e"
-SRC_URI[sha256sum] = "18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3"
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
index 7308465b1b..8ea09b921c 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
@@ -16,7 +16,13 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \
# While this item does not require it, it depends on ffmpeg which does
LICENSE_FLAGS = "commercial"
-SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
+SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
+ file://0006-make-opencv-configurable.patch \
+ file://0007-use-vorbisidec.patch \
+ file://0008-fix-luaL-checkint.patch \
+"
+SRC_URI[md5sum] = "744442ec0c145453ea1d257914c8072e"
+SRC_URI[sha256sum] = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"
inherit autotools gettext pkgconfig distro_features_check