15 files changed, 15 insertions, 84 deletions

diff --git a/common/recipes-multimedia/gstreamer/gst-va-intel.bb b/common/recipes-multimedia/gstreamer/gst-va-intel.bb
deleted file mode 100644
index 556153a9..00000000
--- a/common/recipes-multimedia/gstreamer/gst-va-intel.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "GStreamer Video Acceleration Add-ons for Intel BSPs"
-LICENSE = "MIT"
-DEPENDS = "gst-meta-base"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PR = "r2"
-
-def map_gst_vaapi(d):
-    if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
-       return "gst-va-intel-vaapi"
-    return ""
-
-VAAPI_IMPL = "${@map_gst_vaapi(d)}"
-
-PACKAGES = "\
-    gst-va-intel \
-    gst-va-intel-general \
-    gst-va-intel-video \
-    ${VAAPI_IMPL} \
-    "
-
-ALLOW_EMPTY_gst-va-intel = "1"
-ALLOW_EMPTY_gst-va-intel-general = "1"
-ALLOW_EMPTY_gst-va-intel-video = "1"
-ALLOW_EMPTY_gst-va-intel-vaapi = "1"
-
-RDEPENDS_gst-va-intel = "\
-    gst-va-intel-general \
-    gst-va-intel-video \
-    ${VAAPI_IMPL} \
-    "
-
-RDEPENDS_gst-va-intel-general = "\
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
-    "commercial", "gst-ffmpeg", "", d)} \
-    "
-
-RDEPENDS_gst-va-intel-video = "\
-    gst-plugins-good-isomp4 \
-    "
-
-# The gstreamer-vaapi package contains the vaapi implementation
-#
-RDEPENDS_gst-va-intel-vaapi = "\
-    gstreamer-vaapi-0.10 \
-    "
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-0.10_0.5.9.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-0.10_0.5.9.bb
deleted file mode 100644
index b863a741..00000000
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-0.10_0.5.9.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require gstreamer-vaapi.inc
-
-DEPENDS += "gstreamer gst-plugins-base gst-plugins-bad"
-
-GST_API_VERSION = "0.10"
-
-PACKAGECONFIG_remove = "wayland"
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.9.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb
index c1c4f5ac..c1c4f5ac 100644
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.9.bb
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
index 2b08d1ca..64c61313 100644
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
@@ -15,8 +15,8 @@ SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${REALPN}/${REALPN
            file://install-tests.patch \
            "
 
-SRC_URI[md5sum] = "d213d22affbb2d65ebf6107fec69999b"
-SRC_URI[sha256sum] = "b5efbb5ccd3e9fd1ce16193dd14cfac327a8ec2662794c0067ff2603c3355003"
+SRC_URI[md5sum] = "3bd90b696b644be943450ba0c1497193"
+SRC_URI[sha256sum] = "0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d"
 
 S = "${WORKDIR}/${REALPN}-${PV}"
 
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.4.1.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.bb
index 1a04ef48..ba09c2c6 100644
--- a/common/recipes-multimedia/libva/libva-intel-driver_1.4.1.bb
+++ b/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.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] = "688d5f4d7884b15e70205d528c1d61da"
-SRC_URI[sha256sum] = "fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec"
+SRC_URI[md5sum] = "16752f1584398265072129553b7907ce"
+SRC_URI[sha256sum] = "d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc"
 
 inherit autotools pkgconfig
 
diff --git a/common/recipes-multimedia/libva/libva_1.0.16.bb b/common/recipes-multimedia/libva/libva_1.0.16.bb
deleted file mode 100644
index 4c8ab141..00000000
--- a/common/recipes-multimedia/libva/libva_1.0.16.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libva.inc
-
-PACKAGECONFIG[x11] = ",,virtual/libx11 libxext libxfixes"
-PACKAGECONFIG[wayland] = ",,"
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/libva-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "99343b27cf24e99abc0c5db2d09e30c8"
-SRC_URI[sha256sum] = "03e46f8f48f252e6b6112c495745100bc217ddded801fdb393384aab1fafeaa2"
diff --git a/common/recipes-multimedia/libva/libva_1.4.1.bb b/common/recipes-multimedia/libva/libva_1.4.1.bb
deleted file mode 100644
index 23a499c7..00000000
--- a/common/recipes-multimedia/libva/libva_1.4.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] = "8e3e7096750c14d1f98da807df7c1ba5"
-SRC_URI[sha256sum] = "0662af0ecdf1cfd2bb47e86f5bf66009554fe12ce7bf5b9cec6a2cc43f3f4c11"
diff --git a/common/recipes-multimedia/libva/libva.inc b/common/recipes-multimedia/libva/libva_1.5.0.bb
index f7f50024..85fe4cdb 100644
--- a/common/recipes-multimedia/libva/libva.inc
+++ b/common/recipes-multimedia/libva/libva_1.5.0.bb
@@ -17,11 +17,13 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
-INC_PR = "r1"
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/${BP}.tar.bz2"
+SRC_URI[md5sum] = "ad0b55794308ec397d249a0a2a6df27a"
+SRC_URI[sha256sum] = "e946d4b3110e4e23ec6a588e0c828937e502c67196d1266214441fefc4b83486"
 
 DEPENDS = "libdrm virtual/mesa virtual/libgles1 virtual/libgles2 virtual/egl"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-dummy-driver"
 
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 699d7578..2b79165f 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
 
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index d3da826a..491ef04e 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware lms8"
 
diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
index 6487cd2f..eef4c130 100644
--- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
+++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
@@ -16,7 +16,7 @@ require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 require conf/machine/include/meta-intel.inc
 
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
diff --git a/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf b/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf
index 6bbae7a0..385fb93f 100644
--- a/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf
+++ b/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf
@@ -6,7 +6,7 @@
 #@DESCRIPTION: Machine configuration for Valley Island 32-bit systems, without Intel-proprietary graphics bits
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf b/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf
index a13cc171..7b5fe2d6 100644
--- a/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf
+++ b/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf
@@ -7,7 +7,7 @@
 
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf
index f9ab4d38..bdc4bca1 100644
--- a/meta-nuc/conf/machine/nuc.conf
+++ b/meta-nuc/conf/machine/nuc.conf
@@ -14,7 +14,7 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
            ${XSERVER_X86_EXT} \
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index b5fda31d..a3357370 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -14,7 +14,7 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
+MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
 
 MACHINE_FEATURES += "wifi"