vlc: make opencv explicitly configurable
PATCH 1/2 vlc: make opencv explicitly configurable
World builds are failing due to change in opencv in API.
Since vlc is only using opencv as an example and a filter, disable by default. Revisit when upstream adapts to new opencv API.
Signed-off-by Tim Orling <[email protected]>
--- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 ++- .../vlc/vlc/0006-make-opencv-configurable.patch | 29 ++++++++++++++++++++++ .../recipes-multimedia/vlc/vlc_2.1.4.bb | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -1
@@ -10,7 +10,7 @@ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native gst-plugins-bad \ tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ libdvdcss libdvdread lua-native lua libidn libnotify gtk+ gnome-vfs \ libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \ - libmtp opencv libopus orc libusb1 schroedinger taglib \ + libmtp libopus orc libusb1 schroedinger taglib \ tiff xcb-util-keysyms samba" SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
@@ -50,6 +50,7 @@ PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch new file +29 -0
@@ -0,0 +1,29 @@ +Recent opencv API changes break upstream filter and example. +Make opencv explicitly configurable. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Tim Orling <[email protected]> + +Index: vlc-2.1.4/configure.ac +=================================================================== +--- vlc-2.1.4.orig/configure.ac ++++ vlc-2.1.4/configure.ac +@@ -1693,7 +1693,16 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libblu + dnl + dnl OpenCV wrapper and example filters + dnl +-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto]) ++AC_ARG_ENABLE(opencv, ++ [AS_HELP_STRING([--disable-opencv], ++ [disable OpenCV computer vision filter and example (default auto)])]) ++if test "${enable_opencv}" != "no" ++then ++ PKG_ENABLE_MODULES_VLC([OPENCV], ++ [opencv_example opencv_wrapper], ++ [opencv > 2.0], ++ (OpenCV (computer vision) filter), [auto]) ++fi + + + dnl
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb +1 -0
@@ -8,6 +8,7 @@ SRC_URI += "file://0001-enable-subdir-objects.patch \ file://0003-use-am-path-libgcrypt.patch \ file://0004-modules-gui-qt4-out-of-tree-build.patch \ file://0005-libpostproc-header-check.patch \ + file://0006-make-opencv-configurable.patch \ " SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"
Signature · 1 line
1.9.3
PATCH 2/2 vlc: add PACKAGECONFIG for libva
libva is a floating dependency
libva requires libavcodec, so enable or disable both in tandem
Signed-off-by Tim Orling <[email protected]>
--- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 + 1 file changed, 1 insertion(+)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1 -0
@@ -51,6 +51,7 @@ PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[libva] = "--enable-libva --enable-avcodec,--disable-libva --disable-avcodec,libva libav" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
1.9.3