aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-09-03 10:08:18 -0700
committerGitHub <noreply@github.com>2019-09-03 10:08:18 -0700
commita830cd7664edc727cb0b9fe8c61871558ad68c19 (patch)
tree92f265b9503a68a8f63a6e2cdc77a0505f5482b6
parenta963882200708b8e064166b1fca38b94e6719fb6 (diff)
parent3af16e24d85cd06ae4549846ad343696090214db (diff)
downloadmeta-amd-a830cd7664edc727cb0b9fe8c61871558ad68c19.tar.gz
meta-amd-a830cd7664edc727cb0b9fe8c61871558ad68c19.tar.bz2
meta-amd-a830cd7664edc727cb0b9fe8c61871558ad68c19.zip
Merge pull request #649 from ArsalanHAwan/warrior-vdpau-fixes
warrior: vdpau fixes
-rw-r--r--meta-amd-bsp/conf/machine/e3000.conf2
-rw-r--r--meta-amd-bsp/conf/machine/include/amd-common-configurations.inc2
-rw-r--r--meta-amd-bsp/conf/machine/include/amd-features.inc1
-rw-r--r--meta-amd-bsp/recipes-graphics/vdpau/libvdpau_git.bbappend2
4 files changed, 5 insertions, 2 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index 1d89c3cb..e37cd9b8 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -17,7 +17,7 @@ include conf/machine/include/amd-common-configurations.inc
include conf/machine/include/amd-customer-configurations.inc
MACHINE_FEATURES_remove = "alsa"
-MACHINE_EXTRA_RRECOMMENDS_remove = "vdpauinfo rtc-test alsa-utils"
+MACHINE_EXTRA_RRECOMMENDS_remove = " rtc-test alsa-utils"
# Setup a getty on all serial ports
SERIAL_CONSOLES ?= "115200;ttyS4 115200;ttyS5"
diff --git a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
index 8134bad3..a406de11 100644
--- a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
@@ -24,7 +24,7 @@ MACHINE_FEATURES += "wifi efi alsa"
MACHINE_FEATURES_remove = "qemu-usermode"
MACHINE_EXTRA_RRECOMMENDS += "kernel-modules alsa-utils"
-MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "vdpauinfo", "", d)} grub parted util-linux-blkid"
+MACHINE_EXTRA_RRECOMMENDS += "grub parted util-linux-blkid"
MACHINE_EXTRA_RRECOMMENDS += "rtc-test watchdog-test spi-test smbus-test gpio-test"
MACHINE_EXTRA_RRECOMMENDS += "amd-wdt amd-spi"
diff --git a/meta-amd-bsp/conf/machine/include/amd-features.inc b/meta-amd-bsp/conf/machine/include/amd-features.inc
index d23f51d0..0ac536b2 100644
--- a/meta-amd-bsp/conf/machine/include/amd-features.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-features.inc
@@ -55,6 +55,7 @@ FEATURE_PACKAGES_amd-misc-pkgs = "\
FEATURE_PACKAGES_amd-feature-multimedia = "\
${GSTREAMER_PKGS} \
+ ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "vdpauinfo", "", d)} \
${AMD_FEATURE_MULTIMEDIA_PKGS} \
"
diff --git a/meta-amd-bsp/recipes-graphics/vdpau/libvdpau_git.bbappend b/meta-amd-bsp/recipes-graphics/vdpau/libvdpau_git.bbappend
index d44c262e..087d1573 100644
--- a/meta-amd-bsp/recipes-graphics/vdpau/libvdpau_git.bbappend
+++ b/meta-amd-bsp/recipes-graphics/vdpau/libvdpau_git.bbappend
@@ -1 +1,3 @@
SRCREV = "af517f56d64118520aa0c8456318dd9ec3307e94"
+
+EXTRA_OECONF += "--enable-dri2"