[PATCH 00/12] Packages Upgrade

[PATCH 00/12] Packages Upgrade

[Robert Yang]

The following changes since commit de6a26b95a7f7bd8f9dc47ab35d8b07ba671f4eb:

  x264: use x86 over-ride instead of i586 (2015-06-08 17:32:46 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/PU
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU

Robert Yang (12):
  libpfm4: 4.3.0 -> 4.6.0
  clutter-gst-3.0: 3.0.4 -> 3.0.6
  augeas: 1.2.0 -> 1.4.0
  dropbear: 2014.66 -> 2015.67
  gpgme: 1.4.3 -> 1.5.4
  libav: 9.18 -> 11.4
  gstreamer1.0-libav: fix build for i586 with gcc
  qmmp: 0.7.7 -> 0.8.5
  libevdev: 1.3 -> 1.4.2
  blktrace: 1.0.5 -> 1.1.0
  yasm: 1.2.0 -> 1.3.0
  x264: r2265 -> r2491

 meta/recipes-core/dropbear/dropbear_2014.66.bb     |    4 -
 meta/recipes-core/dropbear/dropbear_2015.67.bb     |    4 +
 meta/recipes-devtools/yasm/yasm_1.2.0.bb           |   13 ---
 meta/recipes-devtools/yasm/yasm_1.3.0.bb           |   14 +++
 meta/recipes-extended/augeas/augeas_1.2.0.bb       |    5 -
 meta/recipes-extended/augeas/augeas_1.4.0.bb       |    4 +
 ...mple-binary-needed-for-core-image-clutter.patch |    0
 .../enable-tests.patch                             |    0
 ...r-gst-3.0_3.0.4.bb => clutter-gst-3.0_3.0.6.bb} |    4 +-
 meta/recipes-kernel/blktrace/blktrace_git.bb       |    3 +-
 .../libpfm/{libpfm4_4.3.0.bb => libpfm4_4.6.0.bb}  |    7 +-
 ...ound-to-build-gst-libav-for-i586-with-gcc.patch |   26 +++++
 .../gstreamer/gstreamer1.0-libav_1.4.5.bb          |    1 +
 meta/recipes-multimedia/libav/libav.inc            |    4 +-
 .../libav/libav/libav-fix-CVE-2014-9676.patch      |   98 ----------------
 ...rkaround-to-build-libav-for-i586-with-gcc.patch |   26 +++++
 meta/recipes-multimedia/libav/libav_11.4.bb        |    4 +
 meta/recipes-multimedia/libav/libav_9.18.bb        |    6 -
 .../don-t-default-to-cortex-a9-with-neon.patch     |   21 +++-
 meta/recipes-multimedia/x264/x264_git.bb           |    4 +-
 .../qt-apps/{qmmp_0.7.7.bb => qmmp_0.8.5.bb}       |    6 +-
 .../gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch      |   56 ----------
 .../gpgme/{gpgme-1.4.3 => gpgme}/gpgme.pc          |    0
 .../gpgme/{gpgme-1.4.3 => gpgme}/pkgconfig.patch   |  117 ++++++++++----------
 .../gpgme/{gpgme_1.4.3.bb => gpgme_1.5.4.bb}       |   10 +-
 .../{libevdev_1.3.bb => libevdev_1.4.2.bb}         |    5 +-
 26 files changed, 174 insertions(+), 268 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2014.66.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2015.67.bb
 delete mode 100644 meta/recipes-devtools/yasm/yasm_1.2.0.bb
 create mode 100644 meta/recipes-devtools/yasm/yasm_1.3.0.bb
 delete mode 100644 meta/recipes-extended/augeas/augeas_1.2.0.bb
 create mode 100644 meta/recipes-extended/augeas/augeas_1.4.0.bb
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0-3.0.4 => clutter-gst-3.0}/0001-Install-example-binary-needed-for-core-image-clutter.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0-3.0.4 => clutter-gst-3.0}/enable-tests.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.4.bb => clutter-gst-3.0_3.0.6.bb} (58%)
 rename meta/recipes-kernel/libpfm/{libpfm4_4.3.0.bb => libpfm4_4.6.0.bb} (78%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
 delete mode 100644 meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
 create mode 100644 meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
 create mode 100644 meta/recipes-multimedia/libav/libav_11.4.bb
 delete mode 100644 meta/recipes-multimedia/libav/libav_9.18.bb
 rename meta/recipes-qt/qt-apps/{qmmp_0.7.7.bb => qmmp_0.8.5.bb} (92%)
 delete mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
 rename meta/recipes-support/gpgme/{gpgme-1.4.3 => gpgme}/gpgme.pc (100%)
 rename meta/recipes-support/gpgme/{gpgme-1.4.3 => gpgme}/pkgconfig.patch (84%)
 rename meta/recipes-support/gpgme/{gpgme_1.4.3.bb => gpgme_1.5.4.bb} (74%)
 rename meta/recipes-support/libevdev/{libevdev_1.3.bb => libevdev_1.4.2.bb} (74%)

-- 
1.7.9.5

[PATCH 01/12] libpfm4: 4.3.0 -> 4.6.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../libpfm/{libpfm4_4.3.0.bb => libpfm4_4.6.0.bb}  |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/libpfm/{libpfm4_4.3.0.bb => libpfm4_4.6.0.bb} (78%)

diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
similarity index 78%
rename from meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb
rename to meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
index 98852f6..b66fbd1 100644
--- a/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb
+++ b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788"
 
 SECTION = "devel"
 
-PR = "r1"
 COMPATIBLE_HOST = "powerpc64"
 
-SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/libpfm4/libpfm-4.3.0.tar.gz"
+SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "0ab272dbdbb759b852ba8bd06db030ef"
-SRC_URI[sha256sum] = "a23eb9affbff279e13563a39317c0ad71c4de28908d4243c8bc109138430cc3b"
+SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487"
+SRC_URI[sha256sum] = "5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f"
 
 EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\""
 EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\""
-- 
1.7.9.5

[PATCH 02/12] clutter-gst-3.0: 3.0.4 -> 3.0.6

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...mple-binary-needed-for-core-image-clutter.patch |    0
 .../enable-tests.patch                             |    0
 ...r-gst-3.0_3.0.4.bb => clutter-gst-3.0_3.0.6.bb} |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0-3.0.4 => clutter-gst-3.0}/0001-Install-example-binary-needed-for-core-image-clutter.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0-3.0.4 => clutter-gst-3.0}/enable-tests.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.4.bb => clutter-gst-3.0_3.0.6.bb} (58%)

diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch
rename to meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch
rename to meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.6.bb
similarity index 58%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb
rename to meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.6.bb
index dbc66e1..27beed9 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.6.bb
@@ -3,5 +3,5 @@ require clutter-gst-3.0.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
 
-SRC_URI[archive.md5sum] = "0b4283e6ccf5ee5d9f5fb635230fc714"
-SRC_URI[archive.sha256sum] = "c61011732428c74923a52cc7629903bd910ecad22634d58f7b0c1dc55235162a"
+SRC_URI[archive.md5sum] = "3100f52225d8be92f57efe246943e3a2"
+SRC_URI[archive.sha256sum] = "d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76"
-- 
1.7.9.5

[PATCH 03/12] augeas: 1.2.0 -> 1.4.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/augeas/augeas_1.2.0.bb |    5 -----
 meta/recipes-extended/augeas/augeas_1.4.0.bb |    4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 meta/recipes-extended/augeas/augeas_1.2.0.bb
 create mode 100644 meta/recipes-extended/augeas/augeas_1.4.0.bb

diff --git a/meta/recipes-extended/augeas/augeas_1.2.0.bb b/meta/recipes-extended/augeas/augeas_1.2.0.bb
deleted file mode 100644
index 67b3941..0000000
--- a/meta/recipes-extended/augeas/augeas_1.2.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require augeas.inc
-
-
-SRC_URI[md5sum] = "dce2f52cbd20f72c7da48e014ad48076"
-SRC_URI[sha256sum] = "f4aeb28ebe0b0921920fe1c9b4c016739c25261a15de04cb97db02d669f481e0"
diff --git a/meta/recipes-extended/augeas/augeas_1.4.0.bb b/meta/recipes-extended/augeas/augeas_1.4.0.bb
new file mode 100644
index 0000000..1064ad4
--- /dev/null
+++ b/meta/recipes-extended/augeas/augeas_1.4.0.bb
@@ -0,0 +1,4 @@
+require augeas.inc
+
+SRC_URI[md5sum] = "a2536a9c3d744dc09d234228fe4b0c93"
+SRC_URI[sha256sum] = "659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30"
-- 
1.7.9.5

[PATCH 04/12] dropbear: 2014.66 -> 2015.67

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/dropbear/dropbear_2014.66.bb |    4 ----
 meta/recipes-core/dropbear/dropbear_2015.67.bb |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2014.66.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2015.67.bb

diff --git a/meta/recipes-core/dropbear/dropbear_2014.66.bb b/meta/recipes-core/dropbear/dropbear_2014.66.bb
deleted file mode 100644
index 8931eb7..0000000
--- a/meta/recipes-core/dropbear/dropbear_2014.66.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "c21a01111aa5015db038c6efdb85717d"
-SRC_URI[sha256sum] = "ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76"
diff --git a/meta/recipes-core/dropbear/dropbear_2015.67.bb b/meta/recipes-core/dropbear/dropbear_2015.67.bb
new file mode 100644
index 0000000..5f7fe7b
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2015.67.bb
@@ -0,0 +1,4 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "e967e320344cd4bfebe321e3ab8514d6"
+SRC_URI[sha256sum] = "7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5"
-- 
1.7.9.5

[PATCH 05/12] gpgme: 1.4.3 -> 1.5.4

[Robert Yang]

* Update pkgconfig.patch
* Remove gpgme-fix-CVE-2014-3564.patch since it is a backport patch
* The license checksum of src/gpgme.h.in is changed because it added the
  year 2014, the conten are the same.
* Remove --without-gpgsm --with-g13 --with-gpgconf --with-gpg from
  EXTRA_OECONF, it doesn't have these options any more, and the values will
  checked located at runtime.
---
 .../gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch      |   56 ----------
 .../gpgme/{gpgme-1.4.3 => gpgme}/gpgme.pc          |    0
 .../gpgme/{gpgme-1.4.3 => gpgme}/pkgconfig.patch   |  117 ++++++++++----------
 .../gpgme/{gpgme_1.4.3.bb => gpgme_1.5.4.bb}       |   10 +-
 4 files changed, 63 insertions(+), 120 deletions(-)
 delete mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
 rename meta/recipes-support/gpgme/{gpgme-1.4.3 => gpgme}/gpgme.pc (100%)
 rename meta/recipes-support/gpgme/{gpgme-1.4.3 => gpgme}/pkgconfig.patch (84%)
 rename meta/recipes-support/gpgme/{gpgme_1.4.3.bb => gpgme_1.5.4.bb} (74%)

diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
deleted file mode 100644
index c728f58..0000000
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Backport
-
-Backport patch to fix CVE-2014-3564.
-
-http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=2cbd76f7911fc215845e89b50d6af5ff4a83dd77
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
-From 2cbd76f7911fc215845e89b50d6af5ff4a83dd77 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Wed, 30 Jul 2014 11:04:55 +0200
-Subject: [PATCH 1/1] Fix possible realloc overflow for gpgsm and uiserver
- engines.
-
-After a realloc (realloc is also used for initial alloc) the allocated
-size if the buffer is not correctly recorded.  Thus an overflow can be
-introduced by receiving data with different line lengths in a specific
-order.  This is not easy exploitable because libassuan constructs the
-line.  However a crash has been reported and thus it might be possible
-to constructs an exploit.
-
-CVE-id: CVE-2014-3564
-Reported-by: Tomáš Trnka
----
- src/engine-gpgsm.c    | 2 +-
- src/engine-uiserver.c | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
-index 8ec1598..3a83757 100644
---- a/src/engine-gpgsm.c
-+++ b/src/engine-gpgsm.c
-@@ -836,7 +836,7 @@ status_handler (void *opaque, int fd)
- 	      else
- 		{
- 		  *aline = newline;
--		  gpgsm->colon.attic.linesize += linelen + 1;
-+		  gpgsm->colon.attic.linesize = *alinelen + linelen + 1;
- 		}
- 	    }
- 	  if (!err)
-diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
-index 2738c36..a7184b7 100644
---- a/src/engine-uiserver.c
-+++ b/src/engine-uiserver.c
-@@ -698,7 +698,7 @@ status_handler (void *opaque, int fd)
- 	      else
- 		{
- 		  *aline = newline;
--		  uiserver->colon.attic.linesize += linelen + 1;
-+		  uiserver->colon.attic.linesize = *alinelen + linelen + 1;
- 		}
- 	    }
- 	  if (!err)
--- 
-2.1.4
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc b/meta/recipes-support/gpgme/gpgme/gpgme.pc
similarity index 100%
rename from meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
rename to meta/recipes-support/gpgme/gpgme/gpgme.pc
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
similarity index 84%
rename from meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch
rename to meta/recipes-support/gpgme/gpgme/pkgconfig.patch
index b29cd70..f79e865 100644
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
@@ -4,11 +4,11 @@ simpler and less error prone when cross compiling.
 Upstream-Status: Rejected [Upstream not interested in pkg-config support]
 RP 2015/4/17
 
-Index: gpgme-1.4.3/configure.ac
-===================================================================
---- gpgme-1.4.3.orig/configure.ac
-+++ gpgme-1.4.3/configure.ac
-@@ -1058,6 +1058,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+diff --git a/configure.ac b/configure.ac
+index 298a22b..c778b61 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
                  src/versioninfo.rc
                  src/gpgme.h)
  AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -16,13 +16,13 @@ Index: gpgme-1.4.3/configure.ac
  AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
  AC_OUTPUT
  
-Index: gpgme-1.4.3/src/Makefile.am
-===================================================================
---- gpgme-1.4.3.orig/src/Makefile.am
-+++ gpgme-1.4.3/src/Makefile.am
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 58922f9..40d0dca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -20,11 +20,13 @@
  
- # Note: moc_kdpipeiodevice should actually be a dependcy below.
+ # Note: moc_kdpipeiodevice should actually be a dependecy below.
  EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
 -	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
 +	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in
@@ -34,32 +34,12 @@ Index: gpgme-1.4.3/src/Makefile.am
 +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
  nodist_include_HEADERS = gpgme.h
  
- if HAVE_PTHREAD
-Index: gpgme-1.4.3/src/gpgme.pc.in
-===================================================================
+ bin_PROGRAMS = gpgme-tool
+diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
+new file mode 100644
+index 0000000..980a48e
 --- /dev/null
-+++ gpgme-1.4.3/src/gpgme.pc.in
-@@ -0,0 +1,15 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+# API info
-+api_version=@GPGME_CONFIG_API_VERSION@
-+host=@GPGME_CONFIG_HOST@
-+
-+Name: gpgme
-+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
-+Version: @VERSION@
-+Libs: -L${libdir} -lgpgme
-+Cflags: -I${includedir}
-+Requires: libassuan gpg-error
-\ No newline at end of file
-Index: gpgme-1.4.3/src/gpgme-pthread.pc.in
-===================================================================
---- /dev/null
-+++ gpgme-1.4.3/src/gpgme-pthread.pc.in
++++ b/src/gpgme-pthread.pc.in
 @@ -0,0 +1,15 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -76,12 +56,12 @@ Index: gpgme-1.4.3/src/gpgme-pthread.pc.in
 +Libs: -L${libdir} -lgpgme-pthread -lpthread
 +Cflags: -I${includedir}
 +Requires: libassuan gpg-error
-Index: gpgme-1.4.3/src/gpgme.m4
-===================================================================
---- gpgme-1.4.3.orig/src/gpgme.m4
-+++ gpgme-1.4.3/src/gpgme.m4
-@@ -36,7 +36,7 @@ dnl               [ACTION-IF-FOUND [, AC
- dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
+diff --git a/src/gpgme.m4 b/src/gpgme.m4
+index 6c2be44..d8a75cb 100644
+--- a/src/gpgme.m4
++++ b/src/gpgme.m4
+@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script
+ dnl is added to the gpg_config_script_warn variable.
  dnl
  AC_DEFUN([AM_PATH_GPGME],
 -[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
@@ -89,11 +69,10 @@ Index: gpgme-1.4.3/src/gpgme.m4
    tmp=ifelse([$1], ,1:0.4.2,$1)
    if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
       req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -45,37 +45,12 @@ AC_DEFUN([AM_PATH_GPGME],
-      req_gpgme_api=0
+@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME],
       min_gpgme_version="$tmp"
    fi
--
+ 
 -  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
 -  ok=no
 -  if test "$GPGME_CONFIG" != "no" ; then
@@ -105,7 +84,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
 -    if test "$gpgme_version_major" -gt "$req_major"; then
 -        ok=yes
--    else 
+-    else
 -        if test "$gpgme_version_major" -eq "$req_major"; then
 -            if test "$gpgme_version_minor" -gt "$req_minor"; then
 -               ok=yes
@@ -119,7 +98,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -        fi
 -    fi
 -  fi
-+  PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no])  
++  PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no])
    if test $ok = yes; then
       # If we have a recent GPGME, we should also check that the
       # API is compatible.
@@ -129,7 +108,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
          if test "$tmp" -gt 0 ; then
             if test "$req_gpgme_api" -ne "$tmp" ; then
               ok=no
-@@ -84,18 +59,10 @@ AC_DEFUN([AM_PATH_GPGME],
+@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME],
       fi
    fi
    if test $ok = yes; then
@@ -137,6 +116,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -    GPGME_LIBS=`$GPGME_CONFIG --libs`
 -    AC_MSG_RESULT(yes)
      ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
    else
 -    GPGME_CFLAGS=""
 -    GPGME_LIBS=""
@@ -148,7 +128,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
  ])
  
  dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
-@@ -104,7 +71,7 @@ dnl Test for libgpgme and define GPGME_P
+@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
  dnl  and GPGME_PTHREAD_LIBS.
  dnl
  AC_DEFUN([AM_PATH_GPGME_PTHREAD],
@@ -157,7 +137,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
    tmp=ifelse([$1], ,1:0.4.2,$1)
    if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
       req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -114,38 +81,13 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
       min_gpgme_version="$tmp"
    fi
  
@@ -173,7 +153,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
 -      if test "$gpgme_version_major" -gt "$req_major"; then
 -        ok=yes
--      else 
+-      else
 -        if test "$gpgme_version_major" -eq "$req_major"; then
 -          if test "$gpgme_version_minor" -gt "$req_minor"; then
 -            ok=yes
@@ -188,8 +168,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -      fi
 -    fi
 -  fi
-+  PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])  
-+
++  PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])
    if test $ok = yes; then
       # If we have a recent GPGME, we should also check that the
       # API is compatible.
@@ -199,7 +178,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
          if test "$tmp" -gt 0 ; then
             if test "$req_gpgme_api" -ne "$tmp" ; then
               ok=no
-@@ -154,18 +96,10 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
       fi
    fi
    if test $ok = yes; then
@@ -207,6 +186,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -    GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
 -    AC_MSG_RESULT(yes)
      ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
    else
 -    GPGME_PTHREAD_CFLAGS=""
 -    GPGME_PTHREAD_LIBS=""
@@ -218,7 +198,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
  ])
  
  
-@@ -184,36 +118,13 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
       min_gpgme_version="$tmp"
    fi
  
@@ -233,7 +213,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
 -    if test "$gpgme_version_major" -gt "$req_major"; then
 -        ok=yes
--    else 
+-    else
 -        if test "$gpgme_version_major" -eq "$req_major"; then
 -            if test "$gpgme_version_minor" -gt "$req_minor"; then
 -               ok=yes
@@ -248,7 +228,6 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -    fi
 -  fi
 +  PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no])  
-+
    if test $ok = yes; then
       # If we have a recent GPGME, we should also check that the
       # API is compatible.
@@ -258,7 +237,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
          if test "$tmp" -gt 0 ; then
             if test "$req_gpgme_api" -ne "$tmp" ; then
               ok=no
-@@ -222,17 +133,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
       fi
    fi
    if test $ok = yes; then
@@ -266,6 +245,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -    GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
 -    AC_MSG_RESULT(yes)
      ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
    else
 -    GPGME_GLIB_CFLAGS=""
 -    GPGME_GLIB_LIBS=""
@@ -275,4 +255,25 @@ Index: gpgme-1.4.3/src/gpgme.m4
 -  AC_SUBST(GPGME_GLIB_CFLAGS)
 -  AC_SUBST(GPGME_GLIB_LIBS)
  ])
- 
+diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
+new file mode 100644
+index 0000000..b69539f
+--- /dev/null
++++ b/src/gpgme.pc.in
+@@ -0,0 +1,15 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@GPGME_CONFIG_API_VERSION@
++host=@GPGME_CONFIG_HOST@
++
++Name: gpgme
++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
++Version: @VERSION@
++Libs: -L${libdir} -lgpgme
++Cflags: -I${includedir}
++Requires: libassuan gpg-error
+\ No newline at end of file
diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
similarity index 74%
rename from meta/recipes-support/gpgme/gpgme_1.4.3.bb
rename to meta/recipes-support/gpgme/gpgme_1.5.4.bb
index f804578..1598377 100644
--- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
@@ -6,22 +6,20 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://src/gpgme.h.in;endline=23;md5=dccb4bb624011e36513c61ef0422d054 \
+                    file://src/gpgme.h.in;endline=23;md5=71ba2ae8d6ca034ed10bd099a8cf473c \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
            file://gpgme.pc \
            file://pkgconfig.patch \
-           file://gpgme-fix-CVE-2014-3564.patch \
           "
 
-SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
-SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
+SRC_URI[md5sum] = "feafa03ea064e1d1dc11bc2b88404623"
+SRC_URI[sha256sum] = "bb38c0ec8815c9e94e6047b484984808a8dad9d6bec8df33dc5339fd55ffea6c"
 
 DEPENDS = "libgpg-error libassuan"
 
 BINCONFIG = "${bindir}/gpgme-config"
-EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
 
 inherit autotools texinfo binconfig-disabled pkgconfig
 
-- 
1.7.9.5

[PATCH 06/12] libav: 9.18 -> 11.4

[Robert Yang]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 7159 bytes --]

* Remove the backport patch libav-fix-CVE-2014-9676.patch.
* Backport a patch from debain to fix the build for i586 with gcc.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/libav/libav.inc            |    4 +-
 .../libav/libav/libav-fix-CVE-2014-9676.patch      |   98 --------------------
 ...rkaround-to-build-libav-for-i586-with-gcc.patch |   26 ++++++
 meta/recipes-multimedia/libav/libav_11.4.bb        |    4 +
 meta/recipes-multimedia/libav/libav_9.18.bb        |    6 --
 5 files changed, 33 insertions(+), 105 deletions(-)
 delete mode 100644 meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
 create mode 100644 meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
 create mode 100644 meta/recipes-multimedia/libav/libav_11.4.bb
 delete mode 100644 meta/recipes-multimedia/libav/libav_9.18.bb

diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 6ef273b..6cd04c7 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-SRC_URI = "http://libav.org/releases/${BP}.tar.xz"
+SRC_URI = "http://libav.org/releases/${BP}.tar.xz \
+           file://workaround-to-build-libav-for-i586-with-gcc.patch \
+"
 
 # Provides ffmpeg compat, see http://libav.org/about.html
 PROVIDES = "ffmpeg"
diff --git a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch b/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
deleted file mode 100644
index 1e31caa..0000000
--- a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Upstream-Status: Backport
-
-Backport patch to fix CVE-2014-9676.
-
-https://security-tracker.debian.org/tracker/CVE-2014-9676
-https://git.libav.org/?p=libav.git;a=commit;h=b3f04657368a32a9903406395f865e230b1de348
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
-From b3f04657368a32a9903406395f865e230b1de348 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Mon, 5 Jan 2015 10:40:41 +0100
-Subject: [PATCH] segment: Fix the failure paths
-
-A failure in segment_end() or segment_start() would lead to freeing
-a dangling pointer and in general further calls to seg_write_packet()
-or to seg_write_trailer() would have the same faulty behaviour.
-
-CC: libav-stable@libav.org
-Reported-By: luodalongde@gmail.com
----
- libavformat/segment.c | 32 ++++++++++++++++++++------------
- 1 file changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/libavformat/segment.c b/libavformat/segment.c
-index 52da6b9..bcfd1f9 100644
---- a/libavformat/segment.c
-+++ b/libavformat/segment.c
-@@ -184,6 +184,13 @@ static void close_null_ctx(AVIOContext *pb)
-     av_free(pb);
- }
- 
-+static void seg_free_context(SegmentContext *seg)
-+{
-+    avio_closep(&seg->pb);
-+    avformat_free_context(seg->avf);
-+    seg->avf = NULL;
-+}
-+
- static int seg_write_header(AVFormatContext *s)
- {
-     SegmentContext *seg = s->priv_data;
-@@ -265,12 +272,9 @@ static int seg_write_header(AVFormatContext *s)
-     }
- 
- fail:
--    if (ret) {
--        if (seg->list)
--            avio_close(seg->pb);
--        if (seg->avf)
--            avformat_free_context(seg->avf);
--    }
-+    if (ret < 0)
-+        seg_free_context(seg);
-+
-     return ret;
- }
- 
-@@ -282,6 +286,9 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
-     int64_t end_pts = seg->recording_time * seg->number;
-     int ret, can_split = 1;
- 
-+    if (!oc)
-+        return AVERROR(EINVAL);
-+
-     if (seg->has_video) {
-         can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
-                     pkt->flags & AV_PKT_FLAG_KEY;
-@@ -322,11 +329,8 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
-     ret = ff_write_chained(oc, pkt->stream_index, pkt, s);
- 
- fail:
--    if (ret < 0) {
--        if (seg->list)
--            avio_close(seg->pb);
--        avformat_free_context(oc);
--    }
-+    if (ret < 0)
-+        seg_free_context(seg);
- 
-     return ret;
- }
-@@ -335,7 +339,11 @@ static int seg_write_trailer(struct AVFormatContext *s)
- {
-     SegmentContext *seg = s->priv_data;
-     AVFormatContext *oc = seg->avf;
--    int ret;
-+    int ret = 0;
-+
-+    if (!oc)
-+        goto fail;
-+
-     if (!seg->write_header_trailer) {
-         if ((ret = segment_end(oc, 0)) < 0)
-             goto fail;
--- 
-2.4.1.314.g9532ead
-
diff --git a/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
new file mode 100644
index 0000000..36f6ded
--- /dev/null
+++ b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
@@ -0,0 +1,26 @@
+Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset
+Author: Bernhard Übelacker <bernhardu@vr-web.de>
+
+---
+Bug-Debian: https://bugs.debian.org/783082
+Last-Update: 2015-04-28
+
+Upstream-Status: Backport [debian]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+--- libav-11.3.orig/libavcodec/h264_cabac.c
++++ libav-11.3/libavcodec/h264_cabac.c
+@@ -2020,7 +2020,11 @@ decode_intra_mb:
+         // In deblocking, the quantizer is 0
+         h->cur_pic.qscale_table[mb_xy] = 0;
+         // All coeffs are present
+-        memset(h->non_zero_count[mb_xy], 16, 48);
++        /*memset(h->non_zero_count[mb_xy], 16, 48);*/
++            /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */
++        for (size_t i = 0; i < 48; i++) {
++            ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
++        }
+         h->cur_pic.mb_type[mb_xy] = mb_type;
+         h->last_qscale_diff = 0;
+         return 0;
diff --git a/meta/recipes-multimedia/libav/libav_11.4.bb b/meta/recipes-multimedia/libav/libav_11.4.bb
new file mode 100644
index 0000000..dde7094
--- /dev/null
+++ b/meta/recipes-multimedia/libav/libav_11.4.bb
@@ -0,0 +1,4 @@
+require libav.inc
+
+SRC_URI[md5sum] = "98c264530a3a5e569543f60b917c3daa"
+SRC_URI[sha256sum] = "0b7dabc2605f3a254ee410bb4b1a857945696aab495fe21b34c3b6544ff5d525"
diff --git a/meta/recipes-multimedia/libav/libav_9.18.bb b/meta/recipes-multimedia/libav/libav_9.18.bb
deleted file mode 100644
index 210a649..0000000
--- a/meta/recipes-multimedia/libav/libav_9.18.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libav.inc
-
-SRC_URI[md5sum] = "75e838068a75fb88e1b4ea0546bc16f0"
-SRC_URI[sha256sum] = "0875e835da683eef1a7bac75e1884634194149d7479d1538ba9fbe1614d066d7"
-
-SRC_URI += "file://libav-fix-CVE-2014-9676.patch"
-- 
1.7.9.5

[PATCH 07/12] gstreamer1.0-libav: fix build for i586 with gcc

[Robert Yang]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 2850 bytes --]

Backport a patch from debian to fix the build for i586 with gcc, the
patch is similar to libav's
workaround-to-build-libav-for-i586-with-gcc.patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...ound-to-build-gst-libav-for-i586-with-gcc.patch |   26 ++++++++++++++++++++
 .../gstreamer/gstreamer1.0-libav_1.4.5.bb          |    1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
new file mode 100644
index 0000000..ccadea4
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
@@ -0,0 +1,26 @@
+Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset
+Author: Bernhard Übelacker <bernhardu@vr-web.de>
+
+---
+Bug-Debian: https://bugs.debian.org/783082
+Last-Update: 2015-04-28
+
+Upstream-Status: Backport [debian]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+--- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c
++++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c
+@@ -2020,7 +2020,11 @@ decode_intra_mb:
+         // In deblocking, the quantizer is 0
+         h->cur_pic.qscale_table[mb_xy] = 0;
+         // All coeffs are present
+-        memset(h->non_zero_count[mb_xy], 16, 48);
++        /*memset(h->non_zero_count[mb_xy], 16, 48);*/
++            /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */
++        for (size_t i = 0; i < 48; i++) {
++            ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
++        }
+         h->cur_pic.mb_type[mb_xy] = mb_type;
+         h->last_qscale_diff = 0;
+         return 0;
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
index 11b1cfb..97fc7ec 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
     file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
+    file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
 "
 SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d"
 SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc"
-- 
1.7.9.5

[PATCH 08/12] qmmp: 0.7.7 -> 0.8.5

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../qt-apps/{qmmp_0.7.7.bb => qmmp_0.8.5.bb}       |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-qt/qt-apps/{qmmp_0.7.7.bb => qmmp_0.8.5.bb} (92%)

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.7.7.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb
similarity index 92%
rename from meta/recipes-qt/qt-apps/qmmp_0.7.7.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.8.5.bb
index 9725b42..aa84c46 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.7.7.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb
@@ -8,12 +8,12 @@ SECTION = "multimedia"
 
 DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl"
 
-SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \
            file://no-host-paths.patch \
           "
 
-SRC_URI[md5sum] = "9376b5d535ed540e97bdff79b42607ae"
-SRC_URI[sha256sum] = "dda66bf60121a8a2cb7175b16b3b948099f8c119ee9a11c671555e8c38caa387"
+SRC_URI[md5sum] = "c9347ad18913058e8a37b1e88b9c6ce2"
+SRC_URI[sha256sum] = "7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d"
 
 inherit cmake qt4x11
 
-- 
1.7.9.5

[PATCH 09/12] libevdev: 1.3 -> 1.4.2

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{libevdev_1.3.bb => libevdev_1.4.2.bb}         |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libevdev/{libevdev_1.3.bb => libevdev_1.4.2.bb} (74%)

diff --git a/meta/recipes-support/libevdev/libevdev_1.3.bb b/meta/recipes-support/libevdev/libevdev_1.4.2.bb
similarity index 74%
rename from meta/recipes-support/libevdev/libevdev_1.3.bb
rename to meta/recipes-support/libevdev/libevdev_1.4.2.bb
index 7206b30..f851305 100644
--- a/meta/recipes-support/libevdev/libevdev_1.3.bb
+++ b/meta/recipes-support/libevdev/libevdev_1.4.2.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
                     file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1"
 
 SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
-SRC_URI[md5sum] = "ab67de8f949e84ae2abb48af09eda423"
-SRC_URI[sha256sum] = "265411ce79a592b3074e9d07fb97d462745d0c7ef178254a6f720245ed253446"
+
+SRC_URI[md5sum] = "debfcd5153558eba25a8e71eb2534ae8"
+SRC_URI[sha256sum] = "7c77b213f075706d428a2af54b66bf86b03a68e9fb390e7ec48cf55065970643"
 
 inherit autotools pkgconfig
-- 
1.7.9.5

[PATCH 10/12] blktrace: 1.0.5 -> 1.1.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-kernel/blktrace/blktrace_git.bb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index ef9f737..1a0f6db 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -6,8 +6,7 @@ DEPENDS = "libaio"
 
 SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385"
 
-PR = "r6"
-PV = "1.0.5+git${SRCPV}"
+PV = "1.1.0+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.dk/blktrace.git \
            file://ldflags.patch"
-- 
1.7.9.5

[PATCH 11/12] yasm: 1.2.0 -> 1.3.0

[Robert Yang]

Its LIC_FILES_CHKSUM changes because the COPYING's year updates, the
content is the same.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/yasm/yasm_1.2.0.bb |   13 -------------
 meta/recipes-devtools/yasm/yasm_1.3.0.bb |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 meta/recipes-devtools/yasm/yasm_1.2.0.bb
 create mode 100644 meta/recipes-devtools/yasm/yasm_1.3.0.bb

diff --git a/meta/recipes-devtools/yasm/yasm_1.2.0.bb b/meta/recipes-devtools/yasm/yasm_1.2.0.bb
deleted file mode 100644
index cc7459b..0000000
--- a/meta/recipes-devtools/yasm/yasm_1.2.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "x86 (SSE) assembler supporting NASM and GAS-syntaxes"
-LICENSE = "BSD"
-HOMEPAGE = "http://www.tortall.net/projects/yasm/"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=26c9f3d11f88911950f9ff62189d3d4f"
-
-SRC_URI = "http://www.tortall.net/projects/yasm/releases/yasm-${PV}.tar.gz"
-SRC_URI[md5sum] = "4cfc0686cf5350dd1305c4d905eb55a6"
-SRC_URI[sha256sum] = "768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31"
-
-inherit autotools gettext
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/yasm/yasm_1.3.0.bb b/meta/recipes-devtools/yasm/yasm_1.3.0.bb
new file mode 100644
index 0000000..78702ed
--- /dev/null
+++ b/meta/recipes-devtools/yasm/yasm_1.3.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "x86 (SSE) assembler supporting NASM and GAS-syntaxes"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.tortall.net/projects/yasm/"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=a12d8903508fb6bfd49d8d82c6170dd9"
+
+SRC_URI = "http://www.tortall.net/projects/yasm/releases/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "fc9e586751ff789b34b1f21d572d96af"
+SRC_URI[sha256sum] = "3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f"
+
+inherit autotools gettext
+
+BBCLASSEXTEND = "native"
-- 
1.7.9.5

[PATCH 12/12] x264: r2265 -> r2491

[Robert Yang]

Update don-t-default-to-cortex-a9-with-neon.patch for aarch64.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../don-t-default-to-cortex-a9-with-neon.patch     |   21 ++++++++++++++------
 meta/recipes-multimedia/x264/x264_git.bb           |    4 ++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
index b844d88..bf72fca 100644
--- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
+++ b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
@@ -4,13 +4,13 @@
 Upstream-Status: Pending
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 
-Index: git/configure
-===================================================================
---- git.orig/configure	2013-02-10 16:26:40.666343682 +0200
-+++ git/configure	2013-02-10 16:27:49.198341677 +0200
-@@ -703,9 +703,6 @@
+diff --git a/configure b/configure
+index 2916036..f4ece40 100755
+--- a/configure
++++ b/configure
+@@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
  fi
-
+ 
  if [ $asm = auto -a $ARCH = ARM ] ; then
 -    # set flags so neon is built by default
 -    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
@@ -18,3 +18,12 @@ Index: git/configure
      if  cc_check '' '' '__asm__("rev ip, ip");' ; then      define HAVE_ARMV6
          cc_check '' '' '__asm__("movt r0, #0");'         && define HAVE_ARMV6T2
          cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
+@@ -788,8 +785,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+ fi
+ 
+ if [ $asm = auto -a $ARCH = AARCH64 ] ; then
+-    # set flags so neon is built by default
+-    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon"
+ 
+     if  cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON
+         ASFLAGS="$ASFLAGS -c"
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 105ccae..0a69909 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -12,9 +12,9 @@ SRC_URI = "git://git.videolan.org/x264.git \
            file://don-t-default-to-cortex-a9-with-neon.patch \
            "
 
-SRCREV = "ffc3ad4945da69f3caa2b40e4eed715a9a8d9526"
+SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6"
 
-PV = "r2265+git${SRCPV}"
+PV = "r2491+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.9.5

Re: [PATCH 10/12] blktrace: 1.0.5 -> 1.1.0

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

On 9 June 2015 at 15:51, Robert Yang <liezhi.yang@windriver.com> wrote:

>  SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385"
>
> -PR = "r6"
> -PV = "1.0.5+git${SRCPV}"
> +PV = "1.1.0+git${SRCPV}"
>

You forgot to change SRCREV :)

Ross

[-- Attachment #2: Type: text/html, Size: 709 bytes --]

Re: [PATCH 10/12] blktrace: 1.0.5 -> 1.1.0

[Robert Yang]

Sorry, I updated it in the repo (and tested it works):

   git://git.openembedded.org/openembedded-core-contrib rbt/PU

diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb 
b/meta/recipes-kernel/blktrace/blktrace_git.bb
index ef9f737..5b0be42 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=393a5ca445f6965873eca0259a17f833"

  DEPENDS = "libaio"

-SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385"
+SRCREV = "43fc870ce04e963def45dfc0d1ed4ea21ef10d4b"

-PR = "r6"
-PV = "1.0.5+git${SRCPV}"
+PV = "1.1.0+git${SRCPV}"

  SRC_URI = "git://git.kernel.dk/blktrace.git \
             file://ldflags.patch"

// Robert

On 06/10/2015 12:50 AM, Burton, Ross wrote:
>
> On 9 June 2015 at 15:51, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>       SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385"
>
>     -PR = "r6"
>     -PV = "1.0.5+git${SRCPV}"
>     +PV = "1.1.0+git${SRCPV}"
>
>
> You forgot to change SRCREV :)
>
> Ross

Re: [PATCH 06/12] libav: 9.18 -> 11.4

[Robert Yang]

Hello,

Other patches had been merged except this one, any comments on it, please ?

// Robert

On 06/09/2015 10:51 PM, Robert Yang wrote:
> * Remove the backport patch libav-fix-CVE-2014-9676.patch.
> * Backport a patch from debain to fix the build for i586 with gcc.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/recipes-multimedia/libav/libav.inc            |    4 +-
>   .../libav/libav/libav-fix-CVE-2014-9676.patch      |   98 --------------------
>   ...rkaround-to-build-libav-for-i586-with-gcc.patch |   26 ++++++
>   meta/recipes-multimedia/libav/libav_11.4.bb        |    4 +
>   meta/recipes-multimedia/libav/libav_9.18.bb        |    6 --
>   5 files changed, 33 insertions(+), 105 deletions(-)
>   delete mode 100644 meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
>   create mode 100644 meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
>   create mode 100644 meta/recipes-multimedia/libav/libav_11.4.bb
>   delete mode 100644 meta/recipes-multimedia/libav/libav_9.18.bb
>
> diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
> index 6ef273b..6cd04c7 100644
> --- a/meta/recipes-multimedia/libav/libav.inc
> +++ b/meta/recipes-multimedia/libav/libav.inc
> @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                       file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
>                       file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>
> -SRC_URI = "http://libav.org/releases/${BP}.tar.xz"
> +SRC_URI = "http://libav.org/releases/${BP}.tar.xz \
> +           file://workaround-to-build-libav-for-i586-with-gcc.patch \
> +"
>
>   # Provides ffmpeg compat, see http://libav.org/about.html
>   PROVIDES = "ffmpeg"
> diff --git a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch b/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> deleted file mode 100644
> index 1e31caa..0000000
> --- a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> +++ /dev/null
> @@ -1,98 +0,0 @@
> -Upstream-Status: Backport
> -
> -Backport patch to fix CVE-2014-9676.
> -
> -https://security-tracker.debian.org/tracker/CVE-2014-9676
> -https://git.libav.org/?p=libav.git;a=commit;h=b3f04657368a32a9903406395f865e230b1de348
> -
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> -From b3f04657368a32a9903406395f865e230b1de348 Mon Sep 17 00:00:00 2001
> -From: Luca Barbato <lu_zero@gentoo.org>
> -Date: Mon, 5 Jan 2015 10:40:41 +0100
> -Subject: [PATCH] segment: Fix the failure paths
> -
> -A failure in segment_end() or segment_start() would lead to freeing
> -a dangling pointer and in general further calls to seg_write_packet()
> -or to seg_write_trailer() would have the same faulty behaviour.
> -
> -CC: libav-stable@libav.org
> -Reported-By: luodalongde@gmail.com
> ----
> - libavformat/segment.c | 32 ++++++++++++++++++++------------
> - 1 file changed, 20 insertions(+), 12 deletions(-)
> -
> -diff --git a/libavformat/segment.c b/libavformat/segment.c
> -index 52da6b9..bcfd1f9 100644
> ---- a/libavformat/segment.c
> -+++ b/libavformat/segment.c
> -@@ -184,6 +184,13 @@ static void close_null_ctx(AVIOContext *pb)
> -     av_free(pb);
> - }
> -
> -+static void seg_free_context(SegmentContext *seg)
> -+{
> -+    avio_closep(&seg->pb);
> -+    avformat_free_context(seg->avf);
> -+    seg->avf = NULL;
> -+}
> -+
> - static int seg_write_header(AVFormatContext *s)
> - {
> -     SegmentContext *seg = s->priv_data;
> -@@ -265,12 +272,9 @@ static int seg_write_header(AVFormatContext *s)
> -     }
> -
> - fail:
> --    if (ret) {
> --        if (seg->list)
> --            avio_close(seg->pb);
> --        if (seg->avf)
> --            avformat_free_context(seg->avf);
> --    }
> -+    if (ret < 0)
> -+        seg_free_context(seg);
> -+
> -     return ret;
> - }
> -
> -@@ -282,6 +286,9 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
> -     int64_t end_pts = seg->recording_time * seg->number;
> -     int ret, can_split = 1;
> -
> -+    if (!oc)
> -+        return AVERROR(EINVAL);
> -+
> -     if (seg->has_video) {
> -         can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
> -                     pkt->flags & AV_PKT_FLAG_KEY;
> -@@ -322,11 +329,8 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
> -     ret = ff_write_chained(oc, pkt->stream_index, pkt, s);
> -
> - fail:
> --    if (ret < 0) {
> --        if (seg->list)
> --            avio_close(seg->pb);
> --        avformat_free_context(oc);
> --    }
> -+    if (ret < 0)
> -+        seg_free_context(seg);
> -
> -     return ret;
> - }
> -@@ -335,7 +339,11 @@ static int seg_write_trailer(struct AVFormatContext *s)
> - {
> -     SegmentContext *seg = s->priv_data;
> -     AVFormatContext *oc = seg->avf;
> --    int ret;
> -+    int ret = 0;
> -+
> -+    if (!oc)
> -+        goto fail;
> -+
> -     if (!seg->write_header_trailer) {
> -         if ((ret = segment_end(oc, 0)) < 0)
> -             goto fail;
> ---
> -2.4.1.314.g9532ead
> -
> diff --git a/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
> new file mode 100644
> index 0000000..36f6ded
> --- /dev/null
> +++ b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-with-gcc.patch
> @@ -0,0 +1,26 @@
> +Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset
> +Author: Bernhard �belacker <bernhardu@vr-web.de>
> +
> +---
> +Bug-Debian: https://bugs.debian.org/783082
> +Last-Update: 2015-04-28
> +
> +Upstream-Status: Backport [debian]
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +
> +--- libav-11.3.orig/libavcodec/h264_cabac.c
> ++++ libav-11.3/libavcodec/h264_cabac.c
> +@@ -2020,7 +2020,11 @@ decode_intra_mb:
> +         // In deblocking, the quantizer is 0
> +         h->cur_pic.qscale_table[mb_xy] = 0;
> +         // All coeffs are present
> +-        memset(h->non_zero_count[mb_xy], 16, 48);
> ++        /*memset(h->non_zero_count[mb_xy], 16, 48);*/
> ++            /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */
> ++        for (size_t i = 0; i < 48; i++) {
> ++            ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
> ++        }
> +         h->cur_pic.mb_type[mb_xy] = mb_type;
> +         h->last_qscale_diff = 0;
> +         return 0;
> diff --git a/meta/recipes-multimedia/libav/libav_11.4.bb b/meta/recipes-multimedia/libav/libav_11.4.bb
> new file mode 100644
> index 0000000..dde7094
> --- /dev/null
> +++ b/meta/recipes-multimedia/libav/libav_11.4.bb
> @@ -0,0 +1,4 @@
> +require libav.inc
> +
> +SRC_URI[md5sum] = "98c264530a3a5e569543f60b917c3daa"
> +SRC_URI[sha256sum] = "0b7dabc2605f3a254ee410bb4b1a857945696aab495fe21b34c3b6544ff5d525"
> diff --git a/meta/recipes-multimedia/libav/libav_9.18.bb b/meta/recipes-multimedia/libav/libav_9.18.bb
> deleted file mode 100644
> index 210a649..0000000
> --- a/meta/recipes-multimedia/libav/libav_9.18.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require libav.inc
> -
> -SRC_URI[md5sum] = "75e838068a75fb88e1b4ea0546bc16f0"
> -SRC_URI[sha256sum] = "0875e835da683eef1a7bac75e1884634194149d7479d1538ba9fbe1614d066d7"
> -
> -SRC_URI += "file://libav-fix-CVE-2014-9676.patch"
>
>
>

Re: [PATCH 06/12] libav: 9.18 -> 11.4

[Paul Eggleton]

I didn't talk to Richard about it but I think there may have been some 
discussion on this list about the possibility of 9->10->11 breaking API 
compatibility with applications. Did you do testing with recipes in meta-
oe/meta-multimedia that depend upon libav?

On Friday 12 June 2015 11:19:59 Robert Yang wrote:
> Hello,
> 
> Other patches had been merged except this one, any comments on it, please ?
> 
> // Robert
> 
> On 06/09/2015 10:51 PM, Robert Yang wrote:
> > * Remove the backport patch libav-fix-CVE-2014-9676.patch.
> > * Backport a patch from debain to fix the build for i586 with gcc.
> > 
> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > ---
> > 
> >   meta/recipes-multimedia/libav/libav.inc            |    4 +-
> >   .../libav/libav/libav-fix-CVE-2014-9676.patch      |   98
> >   -------------------- ...rkaround-to-build-libav-for-i586-with-gcc.patch
> >   |   26 ++++++
> >   meta/recipes-multimedia/libav/libav_11.4.bb        |    4 +
> >   meta/recipes-multimedia/libav/libav_9.18.bb        |    6 --
> >   5 files changed, 33 insertions(+), 105 deletions(-)
> >   delete mode 100644
> >   meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> >   create mode 100644
> >   meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-
> >   with-gcc.patch create mode 100644
> >   meta/recipes-multimedia/libav/libav_11.4.bb
> >   delete mode 100644 meta/recipes-multimedia/libav/libav_9.18.bb
> > 
> > diff --git a/meta/recipes-multimedia/libav/libav.inc
> > b/meta/recipes-multimedia/libav/libav.inc index 6ef273b..6cd04c7 100644
> > --- a/meta/recipes-multimedia/libav/libav.inc
> > +++ b/meta/recipes-multimedia/libav/libav.inc
> > @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM =
> > "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \> 
> >                       file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1
> >                       b79df004 \
> >                       file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d9836802
> >                       33ad02"
> > 
> > -SRC_URI = "http://libav.org/releases/${BP}.tar.xz"
> > +SRC_URI = "http://libav.org/releases/${BP}.tar.xz \
> > +           file://workaround-to-build-libav-for-i586-with-gcc.patch \
> > +"
> > 
> >   # Provides ffmpeg compat, see http://libav.org/about.html
> >   PROVIDES = "ffmpeg"
> > 
> > diff --git
> > a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> > b/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> > deleted file mode 100644
> > index 1e31caa..0000000
> > --- a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
> > +++ /dev/null
> > @@ -1,98 +0,0 @@
> > -Upstream-Status: Backport
> > -
> > -Backport patch to fix CVE-2014-9676.
> > -
> > -https://security-tracker.debian.org/tracker/CVE-2014-9676
> > -https://git.libav.org/?p=libav.git;a=commit;h=b3f04657368a32a9903406395f8
> > 65e230b1de348 -
> > -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> > ----
> > -From b3f04657368a32a9903406395f865e230b1de348 Mon Sep 17 00:00:00 2001
> > -From: Luca Barbato <lu_zero@gentoo.org>
> > -Date: Mon, 5 Jan 2015 10:40:41 +0100
> > -Subject: [PATCH] segment: Fix the failure paths
> > -
> > -A failure in segment_end() or segment_start() would lead to freeing
> > -a dangling pointer and in general further calls to seg_write_packet()
> > -or to seg_write_trailer() would have the same faulty behaviour.
> > -
> > -CC: libav-stable@libav.org
> > -Reported-By: luodalongde@gmail.com
> > ----
> > - libavformat/segment.c | 32 ++++++++++++++++++++------------
> > - 1 file changed, 20 insertions(+), 12 deletions(-)
> > -
> > -diff --git a/libavformat/segment.c b/libavformat/segment.c
> > -index 52da6b9..bcfd1f9 100644
> > ---- a/libavformat/segment.c
> > -+++ b/libavformat/segment.c
> > -@@ -184,6 +184,13 @@ static void close_null_ctx(AVIOContext *pb)
> > -     av_free(pb);
> > - }
> > -
> > -+static void seg_free_context(SegmentContext *seg)
> > -+{
> > -+    avio_closep(&seg->pb);
> > -+    avformat_free_context(seg->avf);
> > -+    seg->avf = NULL;
> > -+}
> > -+
> > - static int seg_write_header(AVFormatContext *s)
> > - {
> > -     SegmentContext *seg = s->priv_data;
> > -@@ -265,12 +272,9 @@ static int seg_write_header(AVFormatContext *s)
> > -     }
> > -
> > - fail:
> > --    if (ret) {
> > --        if (seg->list)
> > --            avio_close(seg->pb);
> > --        if (seg->avf)
> > --            avformat_free_context(seg->avf);
> > --    }
> > -+    if (ret < 0)
> > -+        seg_free_context(seg);
> > -+
> > -     return ret;
> > - }
> > -
> > -@@ -282,6 +286,9 @@ static int seg_write_packet(AVFormatContext *s,
> > AVPacket *pkt) -     int64_t end_pts = seg->recording_time * seg->number;
> > -     int ret, can_split = 1;
> > -
> > -+    if (!oc)
> > -+        return AVERROR(EINVAL);
> > -+
> > -     if (seg->has_video) {
> > -         can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
> > -                     pkt->flags & AV_PKT_FLAG_KEY;
> > -@@ -322,11 +329,8 @@ static int seg_write_packet(AVFormatContext *s,
> > AVPacket *pkt) -     ret = ff_write_chained(oc, pkt->stream_index, pkt,
> > s);
> > -
> > - fail:
> > --    if (ret < 0) {
> > --        if (seg->list)
> > --            avio_close(seg->pb);
> > --        avformat_free_context(oc);
> > --    }
> > -+    if (ret < 0)
> > -+        seg_free_context(seg);
> > -
> > -     return ret;
> > - }
> > -@@ -335,7 +339,11 @@ static int seg_write_trailer(struct AVFormatContext
> > *s) - {
> > -     SegmentContext *seg = s->priv_data;
> > -     AVFormatContext *oc = seg->avf;
> > --    int ret;
> > -+    int ret = 0;
> > -+
> > -+    if (!oc)
> > -+        goto fail;
> > -+
> > -     if (!seg->write_header_trailer) {
> > -         if ((ret = segment_end(oc, 0)) < 0)
> > -             goto fail;
> > ---
> > -2.4.1.314.g9532ead
> > -
> > diff --git
> > a/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-
> > with-gcc.patch
> > b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-
> > with-gcc.patch new file mode 100644
> > index 0000000..36f6ded
> > --- /dev/null
> > +++
> > b/meta/recipes-multimedia/libav/libav/workaround-to-build-libav-for-i586-
> > with-gcc.patch @@ -0,0 +1,26 @@
> > +Description: Workaround to build libav for i586 with gcc 4.9.2 by
> > avoiding memset +Author: Bernhard �belacker <bernhardu@vr-web.de>
> > +
> > +---
> > +Bug-Debian: https://bugs.debian.org/783082
> > +Last-Update: 2015-04-28
> > +
> > +Upstream-Status: Backport [debian]
> > +
> > +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > +
> > +--- libav-11.3.orig/libavcodec/h264_cabac.c
> > ++++ libav-11.3/libavcodec/h264_cabac.c
> > +@@ -2020,7 +2020,11 @@ decode_intra_mb:
> > +         // In deblocking, the quantizer is 0
> > +         h->cur_pic.qscale_table[mb_xy] = 0;
> > +         // All coeffs are present
> > +-        memset(h->non_zero_count[mb_xy], 16, 48);
> > ++        /*memset(h->non_zero_count[mb_xy], 16, 48);*/
> > ++            /* avoiding this memset because it leads at least with
> > gcc4.9.2 to error: 'asm' operand has impossible constraints */ ++       
> > for (size_t i = 0; i < 48; i++) {
> > ++            ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
> > ++        }
> > +         h->cur_pic.mb_type[mb_xy] = mb_type;
> > +         h->last_qscale_diff = 0;
> > +         return 0;
> > diff --git a/meta/recipes-multimedia/libav/libav_11.4.bb
> > b/meta/recipes-multimedia/libav/libav_11.4.bb new file mode 100644
> > index 0000000..dde7094
> > --- /dev/null
> > +++ b/meta/recipes-multimedia/libav/libav_11.4.bb
> > @@ -0,0 +1,4 @@
> > +require libav.inc
> > +
> > +SRC_URI[md5sum] = "98c264530a3a5e569543f60b917c3daa"
> > +SRC_URI[sha256sum] =
> > "0b7dabc2605f3a254ee410bb4b1a857945696aab495fe21b34c3b6544ff5d525" diff
> > --git a/meta/recipes-multimedia/libav/libav_9.18.bb
> > b/meta/recipes-multimedia/libav/libav_9.18.bb deleted file mode 100644
> > index 210a649..0000000
> > --- a/meta/recipes-multimedia/libav/libav_9.18.bb
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -require libav.inc
> > -
> > -SRC_URI[md5sum] = "75e838068a75fb88e1b4ea0546bc16f0"
> > -SRC_URI[sha256sum] =
> > "0875e835da683eef1a7bac75e1884634194149d7479d1538ba9fbe1614d066d7" -
> > -SRC_URI += "file://libav-fix-CVE-2014-9676.patch"

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 06/12] libav: 9.18 -> 11.4

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On 12 June 2015 at 09:40, Paul Eggleton <paul.eggleton@linux.intel.com>
wrote:

> I didn't talk to Richard about it but I think there may have been some
> discussion on this list about the possibility of 9->10->11 breaking API
> compatibility with applications. Did you do testing with recipes in meta-
> oe/meta-multimedia that depend upon libav?
>

Yes, that's exactly why I didn't merge it into MUT: more research needed as
this upgrade was proposed by Kai a few weeks back and there was a
discussion there.

I wasn't rejecting the upgrade, just needed a good look and didn't get
around to it yet.  The big question is upgrade path: does everything in
oe-core still build, and is there a sufficient amount of recipes outside of
oe-core using libav 9 that we should keep it around?

Ross

[-- Attachment #2: Type: text/html, Size: 1310 bytes --]

Re: [PATCH 06/12] libav: 9.18 -> 11.4

[Robert Yang]

On 06/12/2015 07:11 PM, Burton, Ross wrote:
>
> On 12 June 2015 at 09:40, Paul Eggleton <paul.eggleton@linux.intel.com
> <mailto:paul.eggleton@linux.intel.com>> wrote:
>
>     I didn't talk to Richard about it but I think there may have been some
>     discussion on this list about the possibility of 9->10->11 breaking API
>     compatibility with applications. Did you do testing with recipes in meta-
>     oe/meta-multimedia that depend upon libav?
>
>
> Yes, that's exactly why I didn't merge it into MUT: more research needed as this
> upgrade was proposed by Kai a few weeks back and there was a discussion there.
>
> I wasn't rejecting the upgrade, just needed a good look and didn't get around to
> it yet.  The big question is upgrade path: does everything in oe-core still
> build, and is there a sufficient amount of recipes outside of oe-core using
> libav 9 that we should keep it around?

I've tested all oe-core's related recipes with set commercial license flags,
but didn't test the recipes outside of oe-core, I will test the recipes in
meta-oe/meta-multimedia.

// Robert

>
> Ross