Merge remote-tracking branch 'origin/master' into master-enea

7 files changed, 13 insertions, 39 deletions

diff --git a/common/recipes-bsp/efilinux/efilinux_1.0.bb b/common/recipes-bsp/efilinux/efilinux_1.0.bb
index 2a7bf6bf..854fab6d 100644
--- a/common/recipes-bsp/efilinux/efilinux_1.0.bb
+++ b/common/recipes-bsp/efilinux/efilinux_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "A UEFI OS loader"
-LICENSE = "efilinux"
+LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://efilinux.h;beginline=5;endline=31;md5=2316abda893ef24e6cd55cef33aa0edd"
 
 DEPENDS = "gnu-efi"
diff --git a/common/recipes-core/microcode/iucode-tool_1.0.2.bb b/common/recipes-core/microcode/iucode-tool_1.0.2.bb
index b1072f59..13bc5af1 100644
--- a/common/recipes-core/microcode/iucode-tool_1.0.2.bb
+++ b/common/recipes-core/microcode/iucode-tool_1.0.2.bb
@@ -23,3 +23,5 @@ S = "${WORKDIR}/git"
 inherit autotools
 
 BBCLASSEXTEND = "native"
+
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
diff --git a/common/recipes-graphics/intel-gpu-tools/files/install-fitter.patch b/common/recipes-graphics/intel-gpu-tools/files/install-fitter.patch
deleted file mode 100644
index f16d9722..00000000
--- a/common/recipes-graphics/intel-gpu-tools/files/install-fitter.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The panel_fitter is genuinely useful but not installed, so install it.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Index: intel-gpu-tools-1.5/tools/Makefile.am
-===================================================================
---- intel-gpu-tools-1.5.orig/tools/Makefile.am  2013-11-06 16:31:21.000000000 +0200
-+++ intel-gpu-tools-1.5/tools/Makefile.am       2014-03-06 17:34:14.938170240 +0200
-@@ -30,13 +30,13 @@
-        intel_nc_write                  \
-        intel_nc_read                   \
-        intel_vga_read                  \
--       intel_vga_write
-+       intel_vga_write                 \
-+       intel_panel_fitter
- 
- noinst_PROGRAMS =                      \
-        intel_dump_decode               \
-        intel_infoframes                \
--       intel_lid                       \
--       intel_panel_fitter
-+       intel_lid
- 
- dist_bin_SCRIPTS = intel_gpu_abrt
- 
diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.5.bb b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.8.bb
index d54d020c..612b1c91 100644
--- a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.5.bb
+++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.8.bb
@@ -3,10 +3,8 @@ require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
 SUMMARY = "Intel GPU tools"
 DESCRIPTION = "Variety of small tools for testing intel graphics."
 
-SRC_URI += "file://install-fitter.patch"
-
-SRC_URI[md5sum] = "6165a9054de2609f5b1bf0ca0d913f31"
-SRC_URI[sha256sum] = "115475b528c78d67741ae6cbedfbfced1d471b356140e48245cbad8fdfaad1d1"
+SRC_URI[md5sum] = "49d2c3c65204d889189c4d8c14c598b3"
+SRC_URI[sha256sum] = "ffe2a11bca57f7fe36e93d55e4b3685127640e3e6cdae19973b193fe25ff3759"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd"
 
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.3.2.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.4.1.bb
index 9a446696..1a04ef48 100644
--- a/common/recipes-multimedia/libva/libva-intel-driver_1.3.2.bb
+++ b/common/recipes-multimedia/libva/libva-intel-driver_1.4.1.bb
@@ -16,8 +16,8 @@ DEPENDS = "libva libdrm"
 SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2"
 SRC_URI += "file://wayland-include.patch"
 
-SRC_URI[md5sum] = "3f4f08f1d42ee451b2fb9c239ee0b8d7"
-SRC_URI[sha256sum] = "11d956ce11cb85bb009c8eb1ebb768403da2cb82675a6d66649f9c49ef4908d1"
+SRC_URI[md5sum] = "688d5f4d7884b15e70205d528c1d61da"
+SRC_URI[sha256sum] = "fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec"
 
 inherit autotools pkgconfig
 
diff --git a/common/recipes-multimedia/libva/libva_1.3.1.bb b/common/recipes-multimedia/libva/libva_1.3.1.bb
deleted file mode 100644
index 9f80b6d5..00000000
--- a/common/recipes-multimedia/libva/libva_1.3.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libva.inc
-
-SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/${BP}.tar.bz2"
-
-SRC_URI[md5sum] = "eb4db967f068854444b597071c66b480"
-SRC_URI[sha256sum] = "8789b1f1ca9cbc2c1ae477323ec8f5fb269b9360410d4d5e9ec96d679b3cc297"
\ No newline at end of file
diff --git a/common/recipes-multimedia/libva/libva_1.4.1.bb b/common/recipes-multimedia/libva/libva_1.4.1.bb
new file mode 100644
index 00000000..23a499c7
--- /dev/null
+++ b/common/recipes-multimedia/libva/libva_1.4.1.bb
@@ -0,0 +1,6 @@
+require libva.inc
+
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/${BP}.tar.bz2"
+
+SRC_URI[md5sum] = "8e3e7096750c14d1f98da807df7c1ba5"
+SRC_URI[sha256sum] = "0662af0ecdf1cfd2bb47e86f5bf66009554fe12ce7bf5b9cec6a2cc43f3f4c11"