* [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3
@ 2016-03-02 16:21 Martin Jansa
2016-03-02 16:21 ` [PATCH][meta-oe 2/5] vlc: " Martin Jansa
` (3 more replies)
0 siblings, 4 replies; 16+ messages in thread
From: Martin Jansa @ 2016-03-02 16:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 +++
meta-oe/recipes-support/opencv/opencv_3.0.bb | 3 +++
2 files changed, 6 insertions(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index a74853c..eb38a5a 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -103,3 +103,6 @@ do_install_append() {
rm -rf ${D}/usr/lib
fi
}
+
+# http://errors.yoctoproject.org/Errors/Details/40660/
+PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index 1948a16..99ca8b3 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -131,3 +131,6 @@ do_install_append() {
install -d ${D}${datadir}/OpenCV/samples/bin/
cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/
}
+
+# http://errors.yoctoproject.org/Errors/Details/40660/
+PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
--
2.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH][meta-oe 2/5] vlc: blacklist, not compatible with currently used ffmpeg 3 2016-03-02 16:21 [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa @ 2016-03-02 16:21 ` Martin Jansa 2016-03-02 19:25 ` Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 3/5] mplayer2: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa ` (2 subsequent siblings) 3 siblings, 1 reply; 16+ messages in thread From: Martin Jansa @ 2016-03-02 16:21 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 3267dad..32f3ad0 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -104,3 +104,6 @@ FILES_${PN}-dbg += "\ FILES_${PN}-staticdev += "\ ${libdir}/vlc/plugins/*/*.a \ " + +# http://errors.yoctoproject.org/Errors/Details/40690/ +PNBLACKLIST[vlc] ?= "Not compatible with currently used ffmpeg 3" -- 2.7.2 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH][meta-oe 2/5] vlc: blacklist, not compatible with currently used ffmpeg 3 2016-03-02 16:21 ` [PATCH][meta-oe 2/5] vlc: " Martin Jansa @ 2016-03-02 19:25 ` Martin Jansa 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 0 siblings, 2 replies; 16+ messages in thread From: Martin Jansa @ 2016-03-02 19:25 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 1507 bytes --] On Wed, Mar 02, 2016 at 05:21:09PM +0100, Martin Jansa wrote: > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc > index 3267dad..32f3ad0 100644 > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc > @@ -104,3 +104,6 @@ FILES_${PN}-dbg += "\ > FILES_${PN}-staticdev += "\ > ${libdir}/vlc/plugins/*/*.a \ > " > + > +# http://errors.yoctoproject.org/Errors/Details/40690/ > +PNBLACKLIST[vlc] ?= "Not compatible with currently used ffmpeg 3" If anyone is going to work on unblacklisting this then please fix missing $ in PACKAGECONFIG (if I don't forget I'll include this fix in the same commit as PNBLACKLISt) Missing $ before {@ causes few QA errors: vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig] Interesting that nobody noticed. -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 2016-03-02 19:25 ` Martin Jansa @ 2016-03-03 14:28 ` Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 2/4] vlc: update to 2.2.2 Rafaël Carré ` (2 more replies) 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 1 sibling, 3 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 14:28 UTC (permalink / raw) To: openembedded-devel vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig] --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 3267dad..c77f2d1 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -38,7 +38,7 @@ EXTRA_OECONF = "\ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCH 2/4] vlc: update to 2.2.2 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré @ 2016-03-03 14:28 ` Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 14:28 UTC (permalink / raw) To: openembedded-devel Drop rdp.c patch obsoleted by upstream changes --- .../vlc/vlc/0009-fix-rdp-module.patch | 19 ------------------- meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb | 18 ------------------ meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch deleted file mode 100644 index 8e554a9..0000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/modules/access/rdp.c 2015-10-22 19:42:24.447445250 +0000 -+++ b/modules/access/rdp.c 2015-10-22 19:42:46.570445248 +0000 -@@ -428,8 +428,6 @@ - if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; - p_sys->i_frame_interval = 1000000 / p_sys->f_fps; - -- freerdp_channels_global_init(); -- - p_sys->p_instance = freerdp_new(); - if ( !p_sys->p_instance ) - { -@@ -504,7 +502,6 @@ - - freerdp_disconnect( p_sys->p_instance ); - freerdp_free( p_sys->p_instance ); -- freerdp_channels_global_uninit(); - - if ( p_sys->p_block ) - block_Release( p_sys->p_block ); diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb deleted file mode 100644 index fa9d11a..0000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require ${BPN}.inc - -# work around build failure -EXTRA_OECONF += " --enable-libxml2=no" - -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 \ - file://0006-make-opencv-configurable.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ - file://0009-fix-rdp-module.patch \ -" - -SRC_URI[md5sum] = "42273945758b521c408fabc7fd6d9946" -SRC_URI[sha256sum] = "543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb" diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb new file mode 100644 index 0000000..5b15839 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb @@ -0,0 +1,17 @@ +require ${BPN}.inc + +# work around build failure +EXTRA_OECONF += " --enable-libxml2=no" + +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 \ + file://0006-make-opencv-configurable.patch \ + file://0007-use-vorbisidec.patch \ + file://0008-fix-luaL-checkint.patch \ +" + +SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6" +SRC_URI[sha256sum] = "9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCH 3/4] vlc: fix build with ffmpeg 3.0 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 2/4] vlc: update to 2.2.2 Rafaël Carré @ 2016-03-03 14:28 ` Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 14:28 UTC (permalink / raw) To: openembedded-devel --- ...codec-swscale-use-AV_PIX_FMT-consistently.patch | 293 +++++++++++++++++++++ .../0010-SWSCALE-fix-compilation-with-4.x.patch | 45 ++++ .../recipes-multimedia/vlc/vlc_2.2.2.bb | 2 + 3 files changed, 340 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch new file mode 100644 index 0000000..cb3ba71 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch @@ -0,0 +1,293 @@ +From 427732a379893491eac27aeadff0e0b3e252d158 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Mon, 31 Aug 2015 08:19:00 +0200 +Subject: [PATCH] Avcodec/swscale: use AV_PIX_FMT consistently +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit faa7bd357b1f9e07a6ffbc451a188773fad7a275) +Signed-off-by: Rafaël Carré <funman@videolan.org> + +Conflicts: + modules/codec/avcodec/chroma.c + modules/codec/avcodec/video.c +--- + modules/codec/avcodec/chroma.c | 104 ++++++++++++++++++++--------------------- + modules/codec/avcodec/video.c | 10 ++-- + modules/video_chroma/swscale.c | 28 +++++------ + 3 files changed, 71 insertions(+), 71 deletions(-) + +diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c +index 393364b..c31f93d 100644 +--- a/modules/codec/avcodec/chroma.c ++++ b/modules/codec/avcodec/chroma.c +@@ -62,77 +62,77 @@ static const struct + } chroma_table[] = + { + /* Planar YUV formats */ +- {VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 }, +- {VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 }, +- +- {VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 }, +- {VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 }, +- +- {VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 }, +- {VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 }, +- +- {VLC_CODEC_I420, PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_CODEC_YV12, PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_CODEC_J420, PIX_FMT_YUVJ420P, 0, 0, 0 }, +- {VLC_CODEC_I411, PIX_FMT_YUV411P, 0, 0, 0 }, +- {VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 }, +- {VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 }, +- +- {VLC_FOURCC('N','V','1','2'), PIX_FMT_NV12, 0, 0, 0 }, +- {VLC_FOURCC('N','V','2','1'), PIX_FMT_NV21, 0, 0, 0 }, +- +- {VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 }, +- {VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 }, +- {VLC_CODEC_I420_10L, PIX_FMT_YUV420P10LE, 0, 0, 0 }, +- {VLC_CODEC_I420_10B, PIX_FMT_YUV420P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 }, ++ {VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 }, ++ {VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 }, ++ {VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_FOURCC('I','Y','U','V'), AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 }, ++ {VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 }, ++ {VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 }, ++ {VLC_FOURCC('Y','V','U','9'), AV_PIX_FMT_YUV410P, 0, 0, 0 }, ++ ++ {VLC_FOURCC('N','V','1','2'), AV_PIX_FMT_NV12, 0, 0, 0 }, ++ {VLC_FOURCC('N','V','2','1'), AV_PIX_FMT_NV21, 0, 0, 0 }, ++ ++ {VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 }, + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,13,0) +- {VLC_CODEC_I422_9L, PIX_FMT_YUV422P9LE, 0, 0, 0 }, +- {VLC_CODEC_I422_9B, PIX_FMT_YUV422P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 }, + #endif +- {VLC_CODEC_I422_10L, PIX_FMT_YUV422P10LE, 0, 0, 0 }, +- {VLC_CODEC_I422_10B, PIX_FMT_YUV422P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 }, + +- {VLC_CODEC_YUV420A, PIX_FMT_YUVA420P, 0, 0, 0 }, ++ {VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 }, + #if LIBAVUTIL_VERSION_CHECK( 51, 45, 0, 74, 100 ) + {VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 }, + #endif + +- {VLC_CODEC_I444_9L, PIX_FMT_YUV444P9LE, 0, 0, 0 }, +- {VLC_CODEC_I444_9B, PIX_FMT_YUV444P9BE, 0, 0, 0 }, +- {VLC_CODEC_I444_10L, PIX_FMT_YUV444P10LE, 0, 0, 0 }, +- {VLC_CODEC_I444_10B, PIX_FMT_YUV444P10BE, 0, 0, 0 }, +- {VLC_CODEC_I444_16L, PIX_FMT_YUV444P16LE, 0, 0, 0 }, +- {VLC_CODEC_I444_16B, PIX_FMT_YUV444P16BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 }, + + /* Packed YUV formats */ +- {VLC_CODEC_YUYV, PIX_FMT_YUYV422, 0, 0, 0 }, +- {VLC_FOURCC('Y','U','Y','V'), PIX_FMT_YUYV422, 0, 0, 0 }, +- {VLC_CODEC_UYVY, PIX_FMT_UYVY422, 0, 0, 0 }, +- {VLC_FOURCC('Y','4','1','1'), PIX_FMT_UYYVYY411, 0, 0, 0 }, ++ {VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422, 0, 0, 0 }, ++ {VLC_FOURCC('Y','U','Y','V'), AV_PIX_FMT_YUYV422, 0, 0, 0 }, ++ {VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, 0, 0, 0 }, ++ {VLC_FOURCC('Y','4','1','1'), AV_PIX_FMT_UYYVYY411, 0, 0, 0 }, + + /* Packed RGB formats */ +- VLC_RGB( VLC_FOURCC('R','G','B','4'), PIX_FMT_RGB4, PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) +- VLC_RGB( VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) ++ VLC_RGB( VLC_FOURCC('R','G','B','4'), AV_PIX_FMT_RGB4, AV_PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) ++ VLC_RGB( VLC_FOURCC('R','G','B','8'), AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) + +- VLC_RGB( VLC_CODEC_RGB15, PIX_FMT_RGB555, PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) +- VLC_RGB( VLC_CODEC_RGB16, PIX_FMT_RGB565, PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) +- VLC_RGB( VLC_CODEC_RGB24, PIX_FMT_BGR24, PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) ++ VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) ++ VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) ++ VLC_RGB( VLC_CODEC_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) + +- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32, PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) +- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) ++ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) ++ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32_1, AV_PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) + + #ifdef AV_PIX_FMT_0BGR32 + VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 ) + #endif + +- {VLC_CODEC_RGBA, PIX_FMT_RGBA, 0, 0, 0 }, +- {VLC_CODEC_ARGB, PIX_FMT_ARGB, 0, 0, 0 }, +- {VLC_CODEC_BGRA, PIX_FMT_BGRA, 0, 0, 0 }, +- {VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0}, ++ {VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 }, ++ {VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 }, ++ {VLC_CODEC_BGRA, AV_PIX_FMT_BGRA, 0, 0, 0 }, ++ {VLC_CODEC_GREY, AV_PIX_FMT_GRAY8, 0, 0, 0}, + + /* Paletized RGB */ +- {VLC_CODEC_RGBP, PIX_FMT_PAL8, 0, 0, 0}, ++ {VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0}, + + #if LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74,100) + {VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 }, +@@ -201,5 +201,5 @@ int FindFfmpegChroma( vlc_fourcc_t fourcc ) + for( int i = 0; chroma_table[i].i_chroma != 0; i++ ) + if( chroma_table[i].i_chroma == fourcc ) + return chroma_table[i].i_chroma_id; +- return PIX_FMT_NONE; ++ return AV_PIX_FMT_NONE; + } +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index c115db9..ae600e8 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -1004,7 +1004,7 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx, + if (GetVlcChroma(&dec->fmt_out.video, ctx->pix_fmt) != VLC_SUCCESS) + return NULL; + dec->fmt_out.i_codec = dec->fmt_out.video.i_chroma; +- if (ctx->pix_fmt == PIX_FMT_PAL8) ++ if (ctx->pix_fmt == AV_PIX_FMT_PAL8) + return NULL; + + int width = frame->width; +@@ -1180,7 +1180,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) + if (GetVlcChroma(&p_dec->fmt_out.video, p_context->pix_fmt) != VLC_SUCCESS) + goto no_dr; + +- if (p_context->pix_fmt == PIX_FMT_PAL8) ++ if (p_context->pix_fmt == AV_PIX_FMT_PAL8) + goto no_dr; + + p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; +@@ -1215,7 +1215,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) + goto no_dr; + } + +- if( p_context->pix_fmt == PIX_FMT_YUV422P ) ++ if( p_context->pix_fmt == AV_PIX_FMT_YUV422P ) + { + if( 2 * p_pic->p[1].i_pitch != p_pic->p[0].i_pitch || + 2 * p_pic->p[2].i_pitch != p_pic->p[0].i_pitch ) +@@ -1325,7 +1325,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, + + /* Enumerate available formats */ + bool can_hwaccel = false; +- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) ++ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) + { + const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(pi_fmt[i]); + if (dsc == NULL) +@@ -1352,7 +1352,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, + if( p_va == NULL ) + goto end; + +- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) ++ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) + { + if( p_va->pix_fmt != pi_fmt[i] ) + continue; +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 569e0f5..4e0ecf1 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -257,35 +257,35 @@ static void FixParameters( int *pi_fmt, bool *pb_has_a, bool *pb_swap_uv, vlc_fo + switch( fmt ) + { + case VLC_CODEC_YUV422A: +- *pi_fmt = PIX_FMT_YUV422P; ++ *pi_fmt = AV_PIX_FMT_YUV422P; + *pb_has_a = true; + break; + case VLC_CODEC_YUV420A: +- *pi_fmt = PIX_FMT_YUV420P; ++ *pi_fmt = AV_PIX_FMT_YUV420P; + *pb_has_a = true; + break; + case VLC_CODEC_YUVA: +- *pi_fmt = PIX_FMT_YUV444P; ++ *pi_fmt = AV_PIX_FMT_YUV444P; + *pb_has_a = true; + break; + case VLC_CODEC_RGBA: +- *pi_fmt = PIX_FMT_BGR32; ++ *pi_fmt = AV_PIX_FMT_BGR32; + *pb_has_a = true; + break; + case VLC_CODEC_ARGB: +- *pi_fmt = PIX_FMT_BGR32_1; ++ *pi_fmt = AV_PIX_FMT_BGR32_1; + *pb_has_a = true; + break; + case VLC_CODEC_BGRA: +- *pi_fmt = PIX_FMT_RGB32; ++ *pi_fmt = AV_PIX_FMT_RGB32; + *pb_has_a = true; + break; + case VLC_CODEC_YV12: +- *pi_fmt = PIX_FMT_YUV420P; ++ *pi_fmt = AV_PIX_FMT_YUV420P; + *pb_swap_uv = true; + break; + case VLC_CODEC_YV9: +- *pi_fmt = PIX_FMT_YUV410P; ++ *pi_fmt = AV_PIX_FMT_YUV410P; + *pb_swap_uv = true; + break; + default: +@@ -314,7 +314,7 @@ static int GetParameters( ScalerConfiguration *p_cfg, + { + if( p_fmti->i_chroma == VLC_CODEC_YUVP && ALLOW_YUVP ) + { +- i_fmti = i_fmto = PIX_FMT_GRAY8; ++ i_fmti = i_fmto = AV_PIX_FMT_GRAY8; + i_sws_flags = SWS_POINT; + } + } +@@ -327,9 +327,9 @@ static int GetParameters( ScalerConfiguration *p_cfg, + * Without SWS_ACCURATE_RND the quality is really bad for some conversions */ + switch( i_fmto ) + { +- case PIX_FMT_ARGB: +- case PIX_FMT_RGBA: +- case PIX_FMT_ABGR: ++ case AV_PIX_FMT_ARGB: ++ case AV_PIX_FMT_RGBA: ++ case AV_PIX_FMT_ABGR: + i_sws_flags |= SWS_ACCURATE_RND; + break; + } +@@ -403,8 +403,8 @@ static int Init( filter_t *p_filter ) + const unsigned i_fmto_visible_width = p_fmto->i_visible_width * p_sys->i_extend_factor; + for( int n = 0; n < (cfg.b_has_a ? 2 : 1); n++ ) + { +- const int i_fmti = n == 0 ? cfg.i_fmti : PIX_FMT_GRAY8; +- const int i_fmto = n == 0 ? cfg.i_fmto : PIX_FMT_GRAY8; ++ const int i_fmti = n == 0 ? cfg.i_fmti : AV_PIX_FMT_GRAY8; ++ const int i_fmto = n == 0 ? cfg.i_fmto : AV_PIX_FMT_GRAY8; + struct SwsContext *ctx; + + ctx = sws_getContext( i_fmti_visible_width, p_fmti->i_visible_height, i_fmti, +-- +2.5.0 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch new file mode 100644 index 0000000..56744e7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch @@ -0,0 +1,45 @@ +From 6fa8a4a9bb64ff34328aae46acd600f8502b2c05 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Mon, 31 Aug 2015 09:07:39 +0200 +Subject: [PATCH] SWSCALE: fix compilation with 4.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 2b23857c68622edda76b72b74aeb3d943ee277c9) +Signed-off-by: Rafaël Carré <funman@videolan.org> +--- + modules/video_chroma/swscale.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 4e0ecf1..26d0d6f 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -36,6 +36,7 @@ + #include <vlc_cpu.h> + + #include <libswscale/swscale.h> ++#include <libswscale/version.h> + + #ifdef __APPLE__ + # include <TargetConditionals.h> +@@ -235,6 +236,7 @@ static int GetSwsCpuMask(void) + { + int i_sws_cpu = 0; + ++#if LIBSWSCALE_VERSION_MAJOR < 4 + #if defined(__i386__) || defined(__x86_64__) + if( vlc_CPU_MMX() ) + i_sws_cpu |= SWS_CPU_CAPS_MMX; +@@ -248,6 +250,7 @@ static int GetSwsCpuMask(void) + if( vlc_CPU_ALTIVEC() ) + i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; + #endif ++#endif + + return i_sws_cpu; + } +-- +2.5.0 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb index 5b15839..b5be04c 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb @@ -11,6 +11,8 @@ SRC_URI += "file://0001-enable-subdir-objects.patch \ file://0006-make-opencv-configurable.patch \ file://0007-use-vorbisidec.patch \ file://0008-fix-luaL-checkint.patch \ + file://0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch \ + file://0010-SWSCALE-fix-compilation-with-4.x.patch \ " SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCH 4/4] vlc: add libpng PACKAGECONFIG (on by default) 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 2/4] vlc: update to 2.2.2 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré @ 2016-03-03 14:28 ` Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 14:28 UTC (permalink / raw) To: openembedded-devel WARNING: vlc-2.2.2-r0 do_package_qa: QA Issue: vlc rdepends on libpng, but it isn't a build dependency, missing libpng in DEPENDS or PACKAGECONFIG? [build-deps] --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index c77f2d1..8142e16 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -25,7 +25,6 @@ EXTRA_OECONF = "\ --disable-screen --disable-caca \ --enable-httpd --enable-vlm \ --enable-freetype \ - --enable-png \ --enable-tremor \ --enable-v4l2 --disable-aa --disable-faad \ --enable-dbus \ @@ -38,7 +37,7 @@ EXTRA_OECONF = "\ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" @@ -72,6 +71,7 @@ PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 2016-03-02 19:25 ` Martin Jansa 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré @ 2016-03-03 15:50 ` Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2 Rafaël Carré ` (2 more replies) 1 sibling, 3 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 15:50 UTC (permalink / raw) To: openembedded-devel vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig] Signed-off-by: Rafaël Carré <funman@videolan.org> --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 3267dad..c77f2d1 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -38,7 +38,7 @@ EXTRA_OECONF = "\ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré @ 2016-03-03 15:50 ` Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 15:50 UTC (permalink / raw) To: openembedded-devel Drop rdp.c patch obsoleted by upstream changes Signed-off-by: Rafaël Carré <funman@videolan.org> --- .../vlc/vlc/0009-fix-rdp-module.patch | 19 ------------------- meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb | 18 ------------------ meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch deleted file mode 100644 index 8e554a9..0000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/modules/access/rdp.c 2015-10-22 19:42:24.447445250 +0000 -+++ b/modules/access/rdp.c 2015-10-22 19:42:46.570445248 +0000 -@@ -428,8 +428,6 @@ - if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; - p_sys->i_frame_interval = 1000000 / p_sys->f_fps; - -- freerdp_channels_global_init(); -- - p_sys->p_instance = freerdp_new(); - if ( !p_sys->p_instance ) - { -@@ -504,7 +502,6 @@ - - freerdp_disconnect( p_sys->p_instance ); - freerdp_free( p_sys->p_instance ); -- freerdp_channels_global_uninit(); - - if ( p_sys->p_block ) - block_Release( p_sys->p_block ); diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb deleted file mode 100644 index fa9d11a..0000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require ${BPN}.inc - -# work around build failure -EXTRA_OECONF += " --enable-libxml2=no" - -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 \ - file://0006-make-opencv-configurable.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ - file://0009-fix-rdp-module.patch \ -" - -SRC_URI[md5sum] = "42273945758b521c408fabc7fd6d9946" -SRC_URI[sha256sum] = "543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb" diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb new file mode 100644 index 0000000..5b15839 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb @@ -0,0 +1,17 @@ +require ${BPN}.inc + +# work around build failure +EXTRA_OECONF += " --enable-libxml2=no" + +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 \ + file://0006-make-opencv-configurable.patch \ + file://0007-use-vorbisidec.patch \ + file://0008-fix-luaL-checkint.patch \ +" + +SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6" +SRC_URI[sha256sum] = "9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCHv2 3/4] vlc: fix build with ffmpeg 3.0 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2 Rafaël Carré @ 2016-03-03 15:50 ` Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 15:50 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Rafaël Carré <funman@videolan.org> --- ...codec-swscale-use-AV_PIX_FMT-consistently.patch | 293 +++++++++++++++++++++ .../0010-SWSCALE-fix-compilation-with-4.x.patch | 45 ++++ .../recipes-multimedia/vlc/vlc_2.2.2.bb | 2 + 3 files changed, 340 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch new file mode 100644 index 0000000..cb3ba71 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch @@ -0,0 +1,293 @@ +From 427732a379893491eac27aeadff0e0b3e252d158 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Mon, 31 Aug 2015 08:19:00 +0200 +Subject: [PATCH] Avcodec/swscale: use AV_PIX_FMT consistently +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit faa7bd357b1f9e07a6ffbc451a188773fad7a275) +Signed-off-by: Rafaël Carré <funman@videolan.org> + +Conflicts: + modules/codec/avcodec/chroma.c + modules/codec/avcodec/video.c +--- + modules/codec/avcodec/chroma.c | 104 ++++++++++++++++++++--------------------- + modules/codec/avcodec/video.c | 10 ++-- + modules/video_chroma/swscale.c | 28 +++++------ + 3 files changed, 71 insertions(+), 71 deletions(-) + +diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c +index 393364b..c31f93d 100644 +--- a/modules/codec/avcodec/chroma.c ++++ b/modules/codec/avcodec/chroma.c +@@ -62,77 +62,77 @@ static const struct + } chroma_table[] = + { + /* Planar YUV formats */ +- {VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 }, +- {VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 }, +- +- {VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 }, +- {VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 }, +- +- {VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 }, +- {VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 }, +- +- {VLC_CODEC_I420, PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_CODEC_YV12, PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P, 0, 0, 0 }, +- {VLC_CODEC_J420, PIX_FMT_YUVJ420P, 0, 0, 0 }, +- {VLC_CODEC_I411, PIX_FMT_YUV411P, 0, 0, 0 }, +- {VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 }, +- {VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 }, +- +- {VLC_FOURCC('N','V','1','2'), PIX_FMT_NV12, 0, 0, 0 }, +- {VLC_FOURCC('N','V','2','1'), PIX_FMT_NV21, 0, 0, 0 }, +- +- {VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 }, +- {VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 }, +- {VLC_CODEC_I420_10L, PIX_FMT_YUV420P10LE, 0, 0, 0 }, +- {VLC_CODEC_I420_10B, PIX_FMT_YUV420P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 }, ++ {VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 }, ++ {VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 }, ++ {VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 }, ++ ++ {VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_FOURCC('I','Y','U','V'), AV_PIX_FMT_YUV420P, 0, 0, 0 }, ++ {VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 }, ++ {VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 }, ++ {VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 }, ++ {VLC_FOURCC('Y','V','U','9'), AV_PIX_FMT_YUV410P, 0, 0, 0 }, ++ ++ {VLC_FOURCC('N','V','1','2'), AV_PIX_FMT_NV12, 0, 0, 0 }, ++ {VLC_FOURCC('N','V','2','1'), AV_PIX_FMT_NV21, 0, 0, 0 }, ++ ++ {VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 }, + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,13,0) +- {VLC_CODEC_I422_9L, PIX_FMT_YUV422P9LE, 0, 0, 0 }, +- {VLC_CODEC_I422_9B, PIX_FMT_YUV422P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 }, + #endif +- {VLC_CODEC_I422_10L, PIX_FMT_YUV422P10LE, 0, 0, 0 }, +- {VLC_CODEC_I422_10B, PIX_FMT_YUV422P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 }, + +- {VLC_CODEC_YUV420A, PIX_FMT_YUVA420P, 0, 0, 0 }, ++ {VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 }, + #if LIBAVUTIL_VERSION_CHECK( 51, 45, 0, 74, 100 ) + {VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 }, + #endif + +- {VLC_CODEC_I444_9L, PIX_FMT_YUV444P9LE, 0, 0, 0 }, +- {VLC_CODEC_I444_9B, PIX_FMT_YUV444P9BE, 0, 0, 0 }, +- {VLC_CODEC_I444_10L, PIX_FMT_YUV444P10LE, 0, 0, 0 }, +- {VLC_CODEC_I444_10B, PIX_FMT_YUV444P10BE, 0, 0, 0 }, +- {VLC_CODEC_I444_16L, PIX_FMT_YUV444P16LE, 0, 0, 0 }, +- {VLC_CODEC_I444_16B, PIX_FMT_YUV444P16BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 }, ++ {VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 }, ++ {VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 }, + + /* Packed YUV formats */ +- {VLC_CODEC_YUYV, PIX_FMT_YUYV422, 0, 0, 0 }, +- {VLC_FOURCC('Y','U','Y','V'), PIX_FMT_YUYV422, 0, 0, 0 }, +- {VLC_CODEC_UYVY, PIX_FMT_UYVY422, 0, 0, 0 }, +- {VLC_FOURCC('Y','4','1','1'), PIX_FMT_UYYVYY411, 0, 0, 0 }, ++ {VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422, 0, 0, 0 }, ++ {VLC_FOURCC('Y','U','Y','V'), AV_PIX_FMT_YUYV422, 0, 0, 0 }, ++ {VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, 0, 0, 0 }, ++ {VLC_FOURCC('Y','4','1','1'), AV_PIX_FMT_UYYVYY411, 0, 0, 0 }, + + /* Packed RGB formats */ +- VLC_RGB( VLC_FOURCC('R','G','B','4'), PIX_FMT_RGB4, PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) +- VLC_RGB( VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) ++ VLC_RGB( VLC_FOURCC('R','G','B','4'), AV_PIX_FMT_RGB4, AV_PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) ++ VLC_RGB( VLC_FOURCC('R','G','B','8'), AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) + +- VLC_RGB( VLC_CODEC_RGB15, PIX_FMT_RGB555, PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) +- VLC_RGB( VLC_CODEC_RGB16, PIX_FMT_RGB565, PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) +- VLC_RGB( VLC_CODEC_RGB24, PIX_FMT_BGR24, PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) ++ VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) ++ VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) ++ VLC_RGB( VLC_CODEC_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) + +- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32, PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) +- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) ++ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) ++ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32_1, AV_PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) + + #ifdef AV_PIX_FMT_0BGR32 + VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 ) + #endif + +- {VLC_CODEC_RGBA, PIX_FMT_RGBA, 0, 0, 0 }, +- {VLC_CODEC_ARGB, PIX_FMT_ARGB, 0, 0, 0 }, +- {VLC_CODEC_BGRA, PIX_FMT_BGRA, 0, 0, 0 }, +- {VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0}, ++ {VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 }, ++ {VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 }, ++ {VLC_CODEC_BGRA, AV_PIX_FMT_BGRA, 0, 0, 0 }, ++ {VLC_CODEC_GREY, AV_PIX_FMT_GRAY8, 0, 0, 0}, + + /* Paletized RGB */ +- {VLC_CODEC_RGBP, PIX_FMT_PAL8, 0, 0, 0}, ++ {VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0}, + + #if LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74,100) + {VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 }, +@@ -201,5 +201,5 @@ int FindFfmpegChroma( vlc_fourcc_t fourcc ) + for( int i = 0; chroma_table[i].i_chroma != 0; i++ ) + if( chroma_table[i].i_chroma == fourcc ) + return chroma_table[i].i_chroma_id; +- return PIX_FMT_NONE; ++ return AV_PIX_FMT_NONE; + } +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index c115db9..ae600e8 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -1004,7 +1004,7 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx, + if (GetVlcChroma(&dec->fmt_out.video, ctx->pix_fmt) != VLC_SUCCESS) + return NULL; + dec->fmt_out.i_codec = dec->fmt_out.video.i_chroma; +- if (ctx->pix_fmt == PIX_FMT_PAL8) ++ if (ctx->pix_fmt == AV_PIX_FMT_PAL8) + return NULL; + + int width = frame->width; +@@ -1180,7 +1180,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) + if (GetVlcChroma(&p_dec->fmt_out.video, p_context->pix_fmt) != VLC_SUCCESS) + goto no_dr; + +- if (p_context->pix_fmt == PIX_FMT_PAL8) ++ if (p_context->pix_fmt == AV_PIX_FMT_PAL8) + goto no_dr; + + p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; +@@ -1215,7 +1215,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) + goto no_dr; + } + +- if( p_context->pix_fmt == PIX_FMT_YUV422P ) ++ if( p_context->pix_fmt == AV_PIX_FMT_YUV422P ) + { + if( 2 * p_pic->p[1].i_pitch != p_pic->p[0].i_pitch || + 2 * p_pic->p[2].i_pitch != p_pic->p[0].i_pitch ) +@@ -1325,7 +1325,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, + + /* Enumerate available formats */ + bool can_hwaccel = false; +- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) ++ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) + { + const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(pi_fmt[i]); + if (dsc == NULL) +@@ -1352,7 +1352,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, + if( p_va == NULL ) + goto end; + +- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) ++ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) + { + if( p_va->pix_fmt != pi_fmt[i] ) + continue; +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 569e0f5..4e0ecf1 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -257,35 +257,35 @@ static void FixParameters( int *pi_fmt, bool *pb_has_a, bool *pb_swap_uv, vlc_fo + switch( fmt ) + { + case VLC_CODEC_YUV422A: +- *pi_fmt = PIX_FMT_YUV422P; ++ *pi_fmt = AV_PIX_FMT_YUV422P; + *pb_has_a = true; + break; + case VLC_CODEC_YUV420A: +- *pi_fmt = PIX_FMT_YUV420P; ++ *pi_fmt = AV_PIX_FMT_YUV420P; + *pb_has_a = true; + break; + case VLC_CODEC_YUVA: +- *pi_fmt = PIX_FMT_YUV444P; ++ *pi_fmt = AV_PIX_FMT_YUV444P; + *pb_has_a = true; + break; + case VLC_CODEC_RGBA: +- *pi_fmt = PIX_FMT_BGR32; ++ *pi_fmt = AV_PIX_FMT_BGR32; + *pb_has_a = true; + break; + case VLC_CODEC_ARGB: +- *pi_fmt = PIX_FMT_BGR32_1; ++ *pi_fmt = AV_PIX_FMT_BGR32_1; + *pb_has_a = true; + break; + case VLC_CODEC_BGRA: +- *pi_fmt = PIX_FMT_RGB32; ++ *pi_fmt = AV_PIX_FMT_RGB32; + *pb_has_a = true; + break; + case VLC_CODEC_YV12: +- *pi_fmt = PIX_FMT_YUV420P; ++ *pi_fmt = AV_PIX_FMT_YUV420P; + *pb_swap_uv = true; + break; + case VLC_CODEC_YV9: +- *pi_fmt = PIX_FMT_YUV410P; ++ *pi_fmt = AV_PIX_FMT_YUV410P; + *pb_swap_uv = true; + break; + default: +@@ -314,7 +314,7 @@ static int GetParameters( ScalerConfiguration *p_cfg, + { + if( p_fmti->i_chroma == VLC_CODEC_YUVP && ALLOW_YUVP ) + { +- i_fmti = i_fmto = PIX_FMT_GRAY8; ++ i_fmti = i_fmto = AV_PIX_FMT_GRAY8; + i_sws_flags = SWS_POINT; + } + } +@@ -327,9 +327,9 @@ static int GetParameters( ScalerConfiguration *p_cfg, + * Without SWS_ACCURATE_RND the quality is really bad for some conversions */ + switch( i_fmto ) + { +- case PIX_FMT_ARGB: +- case PIX_FMT_RGBA: +- case PIX_FMT_ABGR: ++ case AV_PIX_FMT_ARGB: ++ case AV_PIX_FMT_RGBA: ++ case AV_PIX_FMT_ABGR: + i_sws_flags |= SWS_ACCURATE_RND; + break; + } +@@ -403,8 +403,8 @@ static int Init( filter_t *p_filter ) + const unsigned i_fmto_visible_width = p_fmto->i_visible_width * p_sys->i_extend_factor; + for( int n = 0; n < (cfg.b_has_a ? 2 : 1); n++ ) + { +- const int i_fmti = n == 0 ? cfg.i_fmti : PIX_FMT_GRAY8; +- const int i_fmto = n == 0 ? cfg.i_fmto : PIX_FMT_GRAY8; ++ const int i_fmti = n == 0 ? cfg.i_fmti : AV_PIX_FMT_GRAY8; ++ const int i_fmto = n == 0 ? cfg.i_fmto : AV_PIX_FMT_GRAY8; + struct SwsContext *ctx; + + ctx = sws_getContext( i_fmti_visible_width, p_fmti->i_visible_height, i_fmti, +-- +2.5.0 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch new file mode 100644 index 0000000..56744e7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch @@ -0,0 +1,45 @@ +From 6fa8a4a9bb64ff34328aae46acd600f8502b2c05 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Mon, 31 Aug 2015 09:07:39 +0200 +Subject: [PATCH] SWSCALE: fix compilation with 4.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 2b23857c68622edda76b72b74aeb3d943ee277c9) +Signed-off-by: Rafaël Carré <funman@videolan.org> +--- + modules/video_chroma/swscale.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 4e0ecf1..26d0d6f 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -36,6 +36,7 @@ + #include <vlc_cpu.h> + + #include <libswscale/swscale.h> ++#include <libswscale/version.h> + + #ifdef __APPLE__ + # include <TargetConditionals.h> +@@ -235,6 +236,7 @@ static int GetSwsCpuMask(void) + { + int i_sws_cpu = 0; + ++#if LIBSWSCALE_VERSION_MAJOR < 4 + #if defined(__i386__) || defined(__x86_64__) + if( vlc_CPU_MMX() ) + i_sws_cpu |= SWS_CPU_CAPS_MMX; +@@ -248,6 +250,7 @@ static int GetSwsCpuMask(void) + if( vlc_CPU_ALTIVEC() ) + i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; + #endif ++#endif + + return i_sws_cpu; + } +-- +2.5.0 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb index 5b15839..b5be04c 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb @@ -11,6 +11,8 @@ SRC_URI += "file://0001-enable-subdir-objects.patch \ file://0006-make-opencv-configurable.patch \ file://0007-use-vorbisidec.patch \ file://0008-fix-luaL-checkint.patch \ + file://0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch \ + file://0010-SWSCALE-fix-compilation-with-4.x.patch \ " SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6" -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-multimedia][PATCHv2 4/4] vlc: add libpng PACKAGECONFIG (on by default) 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré @ 2016-03-03 15:50 ` Rafaël Carré 2 siblings, 0 replies; 16+ messages in thread From: Rafaël Carré @ 2016-03-03 15:50 UTC (permalink / raw) To: openembedded-devel WARNING: vlc-2.2.2-r0 do_package_qa: QA Issue: vlc rdepends on libpng, but it isn't a build dependency, missing libpng in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Rafaël Carré <funman@videolan.org> --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index c77f2d1..8142e16 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -25,7 +25,6 @@ EXTRA_OECONF = "\ --disable-screen --disable-caca \ --enable-httpd --enable-vlm \ --enable-freetype \ - --enable-png \ --enable-tremor \ --enable-v4l2 --disable-aa --disable-faad \ --enable-dbus \ @@ -38,7 +37,7 @@ EXTRA_OECONF = "\ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" @@ -72,6 +71,7 @@ PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true -- 2.5.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH][meta-oe 3/5] mplayer2: blacklist, not compatible with currently used ffmpeg 3 2016-03-02 16:21 [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 2/5] vlc: " Martin Jansa @ 2016-03-02 16:21 ` Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 4/5] gst-ffmpeg: " Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 5/5] webkit-efl: blacklist, webkit-efl is old and unmaintained fork with security issues Martin Jansa 3 siblings, 0 replies; 16+ messages in thread From: Martin Jansa @ 2016-03-02 16:21 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 9df4e74..191d4b9 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb @@ -154,3 +154,6 @@ do_install() { install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib } + +# http://errors.yoctoproject.org/Errors/Details/40734/ +PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3" -- 2.7.2 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH][meta-oe 4/5] gst-ffmpeg: blacklist, not compatible with currently used ffmpeg 3 2016-03-02 16:21 [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 2/5] vlc: " Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 3/5] mplayer2: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa @ 2016-03-02 16:21 ` Martin Jansa 2016-03-03 12:38 ` Alexander Kanavin 2016-03-02 16:21 ` [PATCH][meta-oe 5/5] webkit-efl: blacklist, webkit-efl is old and unmaintained fork with security issues Martin Jansa 3 siblings, 1 reply; 16+ messages in thread From: Martin Jansa @ 2016-03-02 16:21 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb index 8909f37..891b10c 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb @@ -98,3 +98,6 @@ FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a" + +# http://errors.yoctoproject.org/Errors/Details/40736/ +PNBLACKLIST[gst-ffmpeg] ?= "Not compatible with currently used ffmpeg 3" -- 2.7.2 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH][meta-oe 4/5] gst-ffmpeg: blacklist, not compatible with currently used ffmpeg 3 2016-03-02 16:21 ` [PATCH][meta-oe 4/5] gst-ffmpeg: " Martin Jansa @ 2016-03-03 12:38 ` Alexander Kanavin 2016-03-03 13:00 ` Martin Jansa 0 siblings, 1 reply; 16+ messages in thread From: Alexander Kanavin @ 2016-03-03 12:38 UTC (permalink / raw) To: openembedded-devel On 03/02/2016 06:21 PM, Martin Jansa wrote: > +# http://errors.yoctoproject.org/Errors/Details/40736/ > +PNBLACKLIST[gst-ffmpeg] ?= "Not compatible with currently used ffmpeg 3" Before blacklisting, you should try switching to gst-ffmpeg's internal copy of that library, and see if it helps: PACKAGECONFIG ??= "external-libav" PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav" So drop external-libav from PACKAGECONFIG. Alex ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH][meta-oe 4/5] gst-ffmpeg: blacklist, not compatible with currently used ffmpeg 3 2016-03-03 12:38 ` Alexander Kanavin @ 2016-03-03 13:00 ` Martin Jansa 0 siblings, 0 replies; 16+ messages in thread From: Martin Jansa @ 2016-03-03 13:00 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 905 bytes --] On Thu, Mar 03, 2016 at 02:38:14PM +0200, Alexander Kanavin wrote: > On 03/02/2016 06:21 PM, Martin Jansa wrote: > > > +# http://errors.yoctoproject.org/Errors/Details/40736/ > > +PNBLACKLIST[gst-ffmpeg] ?= "Not compatible with currently used ffmpeg 3" > > Before blacklisting, you should try switching to gst-ffmpeg's internal > copy of that library, and see if it helps: I'm not using gst-ffmpeg, someone who can test it in runtime should try it. > PACKAGECONFIG ??= "external-libav" > PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav" > > So drop external-libav from PACKAGECONFIG. > > Alex > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH][meta-oe 5/5] webkit-efl: blacklist, webkit-efl is old and unmaintained fork with security issues 2016-03-02 16:21 [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa ` (2 preceding siblings ...) 2016-03-02 16:21 ` [PATCH][meta-oe 4/5] gst-ffmpeg: " Martin Jansa @ 2016-03-02 16:21 ` Martin Jansa 3 siblings, 0 replies; 16+ messages in thread From: Martin Jansa @ 2016-03-02 16:21 UTC (permalink / raw) To: openembedded-devel * now it also fails to build again with; webkit-efl/1_1.11.0-r0/ewebkit/Source/JavaScriptCore/profiler/ProfileNode.cpp:126:41: error: 'isnan' was not declared in this scope adding cmath include could be enough, but this was last drop of my patience Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-efl/recipes-efl/e17/elbow_git.bb | 2 ++ meta-efl/recipes-efl/webkit/webkit-efl.inc | 3 +++ 2 files changed, 5 insertions(+) diff --git a/meta-efl/recipes-efl/e17/elbow_git.bb b/meta-efl/recipes-efl/e17/elbow_git.bb index 064b794..06ed2c9 100644 --- a/meta-efl/recipes-efl/e17/elbow_git.bb +++ b/meta-efl/recipes-efl/e17/elbow_git.bb @@ -22,3 +22,5 @@ SRC_URI = " \ S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/themes" + +PNBLACKLIST[elbow] ?= "Depends on blacklisted webkit-efl" diff --git a/meta-efl/recipes-efl/webkit/webkit-efl.inc b/meta-efl/recipes-efl/webkit/webkit-efl.inc index aa91572..c6ef976 100644 --- a/meta-efl/recipes-efl/webkit/webkit-efl.inc +++ b/meta-efl/recipes-efl/webkit/webkit-efl.inc @@ -64,3 +64,6 @@ FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}launcher = "${bindir}/EWebLauncher" FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher" FILES_${PN}-inspector += "${datadir}/ewebkit2-1/inspector" + +# http://errors.yoctoproject.org/Errors/Details/40659/ +PNBLACKLIST[webkit-efl] ?= "Old and unmaintaned fork with many security issues" -- 2.7.2 ^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-03-03 15:50 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-03-02 16:21 [PATCH][meta-oe 1/5] opencv: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 2/5] vlc: " Martin Jansa 2016-03-02 19:25 ` Martin Jansa 2016-03-03 14:28 ` [meta-multimedia][PATCH 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 2/4] vlc: update to 2.2.2 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré 2016-03-03 14:28 ` [meta-multimedia][PATCH 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 1/4] vlc: Fix typo introduced in 0f2b3139521570ad494a72399f8a9dae76e69b16 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 3/4] vlc: fix build with ffmpeg 3.0 Rafaël Carré 2016-03-03 15:50 ` [meta-multimedia][PATCHv2 4/4] vlc: add libpng PACKAGECONFIG (on by default) Rafaël Carré 2016-03-02 16:21 ` [PATCH][meta-oe 3/5] mplayer2: blacklist, not compatible with currently used ffmpeg 3 Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 4/5] gst-ffmpeg: " Martin Jansa 2016-03-03 12:38 ` Alexander Kanavin 2016-03-03 13:00 ` Martin Jansa 2016-03-02 16:21 ` [PATCH][meta-oe 5/5] webkit-efl: blacklist, webkit-efl is old and unmaintained fork with security issues Martin Jansa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox