From c939705c186388df1eb68341a207fb2c6ac95f66 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 4 Sep 2014 15:55:06 -0700 Subject: Remove all the changes related to the proprietary EMGD graphics driver As all the EMGD based BSPs have been retired, there is no need for the proprietary EMGD support in the meta-intel layer. Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- common/recipes-multimedia/gstreamer/gst-va-intel.bb | 9 --------- common/recipes-multimedia/libva/va-intel.bb | 3 --- 2 files changed, 12 deletions(-) (limited to 'common/recipes-multimedia') diff --git a/common/recipes-multimedia/gstreamer/gst-va-intel.bb b/common/recipes-multimedia/gstreamer/gst-va-intel.bb index 5e4dd991..9e179b9a 100644 --- a/common/recipes-multimedia/gstreamer/gst-va-intel.bb +++ b/common/recipes-multimedia/gstreamer/gst-va-intel.bb @@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d PR = "r2" def map_gst_vaapi(d): - if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1": - return "gst-va-mixvideo-vaapi" if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1": return "gst-va-intel-vaapi" return "" @@ -26,7 +24,6 @@ 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" -ALLOW_EMPTY_gst-va-mixvideo-vaapi = "1" RDEPENDS_gst-va-intel = "\ gst-va-intel-general \ @@ -48,9 +45,3 @@ RDEPENDS_gst-va-intel-video = "\ RDEPENDS_gst-va-intel-vaapi = "\ gstreamer-vaapi \ " - -# The emgd driver contains the vaapi implementation -# -RDEPENDS_gst-va-mixvideo-vaapi = "\ - emgd-driver-bin \ - " diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb index 57a16097..93df94d2 100644 --- a/common/recipes-multimedia/libva/va-intel.bb +++ b/common/recipes-multimedia/libva/va-intel.bb @@ -6,9 +6,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d PR = "r1" def map_valibs(d): - # The emgd mixvideo implementation requires libva-x11/tpi/glx/egl - if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1": - return "libva libva-x11 libva-tpi libva-glx libva-egl" # The intel implementation requires the libva-intel-driver package if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1": return "libva libva-intel-driver" -- cgit v1.2.3-54-g00ecf