From 4131e6dc552ca6aad043d27671ecaef9ad7292c4 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 21 Jul 2014 20:27:02 -0700 Subject: vlc: add PACKAGECONFIG for postproc, patch for postproc header check * Built with libav 9.13 and stand-alone libpostproc * Although postproc is enable=auto, let's leave it disabled by default Signed-off-by: Tim Orling Signed-off-by: Martin Jansa --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 + .../vlc/vlc/0005-libpostproc-header-check.patch | 17 +++++++++++++++++ meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb | 1 + 3 files changed, 19 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index c188771739..88605dfaa7 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -49,6 +49,7 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 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" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch new file mode 100644 index 0000000000..2d84ffd2f4 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch @@ -0,0 +1,17 @@ +* Also look for postprocess.h under libpostproc/ + +Upstream-status: Pending + +Index: vlc-2.1.4/configure.ac +=================================================================== +--- vlc-2.1.4.orig/configure.ac ++++ vlc-2.1.4/configure.ac +@@ -2444,7 +2444,7 @@ then + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" + CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" +- AC_CHECK_HEADERS(postproc/postprocess.h) ++ AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) + VLC_ADD_PLUGIN([postproc]) + VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS]) + VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS]) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb index f9be48dba8..b4047d3be4 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb @@ -7,6 +7,7 @@ SRC_URI += "file://0001-enable-subdir-objects.patch \ file://0002-glibc-does-not-provide-strlcpy.patch \ file://0003-use-am-path-libgcrypt.patch \ file://0004-modules-gui-qt4-out-of-tree-build.patch \ + file://0005-libpostproc-header-check.patch \ " SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222" -- cgit 1.2.3-korg