diff options
author | Tim Orling <ticotimo@gmail.com> | 2014-07-21 20:27:02 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-24 15:31:49 +0200 |
commit | 4131e6dc552ca6aad043d27671ecaef9ad7292c4 (patch) | |
tree | c75aca6d1a81a9f8fea75f4d174e5c9832c7fe15 /meta-multimedia | |
parent | 126d63b9bea9b4130d20e140b947ab8b98863cc0 (diff) | |
download | meta-openembedded-4131e6dc552ca6aad043d27671ecaef9ad7292c4.tar.gz |
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 <TicoTimo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
3 files changed, 19 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index c18877173..88605dfaa 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" | |||
49 | PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" | 49 | PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" |
50 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" | 50 | PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" |
51 | PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" | 51 | PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" |
52 | PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" | ||
52 | 53 | ||
53 | do_configure_prepend() { | 54 | do_configure_prepend() { |
54 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true | 55 | 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 000000000..2d84ffd2f --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | * Also look for postprocess.h under libpostproc/ | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | |||
5 | Index: vlc-2.1.4/configure.ac | ||
6 | =================================================================== | ||
7 | --- vlc-2.1.4.orig/configure.ac | ||
8 | +++ vlc-2.1.4/configure.ac | ||
9 | @@ -2444,7 +2444,7 @@ then | ||
10 | VLC_SAVE_FLAGS | ||
11 | CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" | ||
12 | CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" | ||
13 | - AC_CHECK_HEADERS(postproc/postprocess.h) | ||
14 | + AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) | ||
15 | VLC_ADD_PLUGIN([postproc]) | ||
16 | VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS]) | ||
17 | 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 f9be48dba..b4047d3be 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 \ | |||
7 | file://0002-glibc-does-not-provide-strlcpy.patch \ | 7 | file://0002-glibc-does-not-provide-strlcpy.patch \ |
8 | file://0003-use-am-path-libgcrypt.patch \ | 8 | file://0003-use-am-path-libgcrypt.patch \ |
9 | file://0004-modules-gui-qt4-out-of-tree-build.patch \ | 9 | file://0004-modules-gui-qt4-out-of-tree-build.patch \ |
10 | file://0005-libpostproc-header-check.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222" | 13 | SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222" |