4 files changed, 7 insertions, 7 deletions

diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index c98aa78a..0942e777 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -7,10 +7,10 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
 PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"
 
-PREFERRED_VERSION_linux-intel ?= "6.12%"
-PREFERRED_VERSION_linux-intel-rt ?= "6.12%"
-PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.12%"
-PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.12%"
+PREFERRED_VERSION_linux-intel ?= "6.18%"
+PREFERRED_VERSION_linux-intel-rt ?= "6.18%"
+PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.18%"
+PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.18%"
 
 # Need to point to latest version of libva needed for media components
 PREFERRED_PROVIDER_libva = "libva-intel"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 5b134dc3..52383170 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-plugins-bad"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 947f72d4..bd1f31fa 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-plugins-bad"
 
 # Enable optional dpdk:
 COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index bfaf08dd..74fb9797 100644
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES += "efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-plugins-bad"
 
 COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
 COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64"