diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
| commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
| tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtmultimedia | |
| parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 8547f72a..2022d577 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From 849355a1c59d76fa39dc93b537458a084190fa45 Mon Sep 17 00:00:00 2001 +From 04d1a3141dd001ca66b233b5faaa8d0c99bf5207 Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration @@ -67,10 +67,10 @@ index 0000000..2423697 + +#endif diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -index 2e2092b..54568db 100644 +index 465ccfa..40e7592 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -@@ -31,8 +31,9 @@ +@@ -37,8 +37,9 @@ ** ****************************************************************************/ @@ -83,10 +83,10 @@ index 2e2092b..54568db 100644 #include "qsgvivantevideomaterial.h" #include "qsgvivantevideomaterialshader.h" diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -index 229a69b..184fd12 100644 +index c8d83b4..5b1b8f2 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -@@ -31,8 +31,9 @@ +@@ -37,8 +37,9 @@ ** ****************************************************************************/ @@ -98,6 +98,3 @@ index 229a69b..184fd12 100644 #include "qsgvivantevideonode.h" #include "qsgvivantevideomaterialshader.h" --- -1.9.1 - |