diff options
-rw-r--r-- | common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb | 30 | ||||
-rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 3 | ||||
-rw-r--r-- | meta-emenlow/conf/machine/emenlow.conf | 3 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 2 | ||||
-rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 2 |
5 files changed, 21 insertions, 19 deletions
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb index de201b25..5dc208de 100644 --- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb | |||
@@ -7,7 +7,7 @@ to LICENSE_FLAGS_WHITELIST += \"license_emgd-driver-bin_1.14\" to your \ | |||
7 | local.conf in order to enable it in a build." | 7 | local.conf in order to enable it in a build." |
8 | LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14" | 8 | LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14" |
9 | LICENSE_FLAGS = "license_${PN}_${PV}" | 9 | LICENSE_FLAGS = "license_${PN}_${PV}" |
10 | PR = "r6" | 10 | PR = "r7" |
11 | 11 | ||
12 | EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" | 12 | EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" |
13 | EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2" | 13 | EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2" |
@@ -39,9 +39,9 @@ PKG_${PN}-dev = "emgd-driver-dev" | |||
39 | PKG_${PN}-dbg = "emgd-driver-dbg" | 39 | PKG_${PN}-dbg = "emgd-driver-dbg" |
40 | PKG_${PN}-doc = "emgd-driver-doc" | 40 | PKG_${PN}-doc = "emgd-driver-doc" |
41 | 41 | ||
42 | PACKAGES =+ "emgd-libmixcommon-0.10.8 emgd-libmixvideo-0.10.9 emgd-libmixvbp-0.10.8 \ | 42 | PACKAGES =+ "emgd-libmixcommon emgd-libmixvideo emgd-libmixvbp \ |
43 | emgd-gst-vabuffer-0.10.8 emgd-gst-plugins-mixvideo-0.10.34 \ | 43 | emgd-gst-vabuffer emgd-gst-plugins-mixvideo \ |
44 | emgd-gst-plugins-va-0.10.10 emgd-driver-video" | 44 | emgd-gst-plugins-va emgd-driver-video" |
45 | 45 | ||
46 | # These are closed binaries generated elsewhere so don't check ldflags & text relocations | 46 | # These are closed binaries generated elsewhere so don't check ldflags & text relocations |
47 | INSANE_SKIP_emgd-driver-video = "ldflags textrel" | 47 | INSANE_SKIP_emgd-driver-video = "ldflags textrel" |
@@ -49,20 +49,20 @@ INSANE_SKIP_emgd-driver-video = "ldflags textrel" | |||
49 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 49 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
50 | 50 | ||
51 | # Avoid auto renaming of there packages | 51 | # Avoid auto renaming of there packages |
52 | DEBIAN_NOAUTONAME_emgd-libmixcommon-0.10.8 = "1" | 52 | DEBIAN_NOAUTONAME_emgd-libmixcommon = "1" |
53 | DEBIAN_NOAUTONAME_emgd-libmixvideo-0.10.9 = "1" | 53 | DEBIAN_NOAUTONAME_emgd-libmixvideo = "1" |
54 | DEBIAN_NOAUTONAME_emgd-libmixvbp-0.10.8 = "1" | 54 | DEBIAN_NOAUTONAME_emgd-libmixvbp = "1" |
55 | DEBIAN_NOAUTONAME_emgd-gst-vabuffer-0.10.8 = "1" | 55 | DEBIAN_NOAUTONAME_emgd-gst-vabuffer = "1" |
56 | 56 | ||
57 | FILES_emgd-libmixcommon-0.10.8 = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0" | 57 | FILES_emgd-libmixcommon = "${libdir}/libmixcommon.so.0.10.8 ${libdir}/libmixcommon.so.0" |
58 | FILES_emgd-libmixvideo-0.10.9 = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0" | 58 | FILES_emgd-libmixvideo = "${libdir}/libmixvideo.so.0.10.9 ${libdir}/libmixvideo.so.0" |
59 | FILES_emgd-libmixvbp-0.10.8 = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \ | 59 | FILES_emgd-libmixvbp = "${libdir}/libmixvbp.so.0.10.8 ${libdir}/libmixvbp.so.0 \ |
60 | ${libdir}/libmixvbp_h264.so.0.10.8 ${libdir}/libmixvbp_h264.so.0 \ | 60 | ${libdir}/libmixvbp_h264.so.0.10.8 ${libdir}/libmixvbp_h264.so.0 \ |
61 | ${libdir}/libmixvbp_mpeg4.so.0.10.8 ${libdir}/libmixvbp_mpeg4.so.0 \ | 61 | ${libdir}/libmixvbp_mpeg4.so.0.10.8 ${libdir}/libmixvbp_mpeg4.so.0 \ |
62 | ${libdir}/libmixvbp_vc1.so.0.10.8 ${libdir}/libmixvbp_vc1.so.0 " | 62 | ${libdir}/libmixvbp_vc1.so.0.10.8 ${libdir}/libmixvbp_vc1.so.0 " |
63 | FILES_emgd-gst-vabuffer-0.10.8 = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0" | 63 | FILES_emgd-gst-vabuffer = "${libdir}/libgstvabuffer.so.0.10.8 ${libdir}/libgstvabuffer.so.0" |
64 | FILES_emgd-gst-plugins-mixvideo-0.10.34 = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so" | 64 | FILES_emgd-gst-plugins-mixvideo = "${libdir}/gstreamer-0.10/libgstmixvideoplugin.so" |
65 | FILES_emgd-gst-plugins-va-0.10.10 = "${libdir}/gstreamer-0.10/libgstvaplugin.so" | 65 | FILES_emgd-gst-plugins-va = "${libdir}/gstreamer-0.10/libgstvaplugin.so" |
66 | FILES_emgd-driver-video = "${libdir}/dri/emgd_drv_video.so" | 66 | FILES_emgd-driver-video = "${libdir}/dri/emgd_drv_video.so" |
67 | FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers" | 67 | FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers" |
68 | FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug" | 68 | FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug" |
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 0e10e76e..7324c61f 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
@@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
23 | PREFERRED_VERSION_mesa-dri ?= "8.0.4" | 23 | PREFERRED_VERSION_mesa-dri ?= "8.0.4" |
24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
25 | PREFERRED_VERSION_emgd-driver-bin ?= "1.14" | ||
25 | 26 | ||
26 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 27 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" |
27 | 28 | ||
@@ -29,6 +30,6 @@ APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | |||
29 | # Add these only when Xserver is enabled with the EMGD driver | 30 | # Add these only when Xserver is enabled with the EMGD driver |
30 | # Otherwise unwanted X components will start showing up in the non-X images | 31 | # Otherwise unwanted X components will start showing up in the non-X images |
31 | VA_FEATURES ?= "gst-va-intel va-intel \ | 32 | VA_FEATURES ?= "gst-va-intel va-intel \ |
32 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | 33 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" |
33 | 34 | ||
34 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 35 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 39da41cb..dc9fde8d 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf | |||
@@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
23 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 23 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
25 | PREFERRED_VERSION_emgd-driver-bin ?= "1.14" | ||
25 | 26 | ||
26 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 27 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" |
27 | 28 | ||
@@ -29,6 +30,6 @@ APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | |||
29 | # Add these only when Xserver is enabled with the EMGD driver | 30 | # Add these only when Xserver is enabled with the EMGD driver |
30 | # Otherwise unwanted X components will start showing up in the non-X images | 31 | # Otherwise unwanted X components will start showing up in the non-X images |
31 | VA_FEATURES ?= "gst-va-intel va-intel \ | 32 | VA_FEATURES ?= "gst-va-intel va-intel \ |
32 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | 33 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" |
33 | 34 | ||
34 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 35 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 0efba2a3..e116ac90 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -13,7 +13,7 @@ require conf/machine/include/meta-intel.inc | |||
13 | # Add these only when Xserver is enabled with the EMGD driver | 13 | # Add these only when Xserver is enabled with the EMGD driver |
14 | # Otherwise unwanted X components will start showing up in the non-X images | 14 | # Otherwise unwanted X components will start showing up in the non-X images |
15 | VA_FEATURES ?= "gst-va-intel va-intel \ | 15 | VA_FEATURES ?= "gst-va-intel va-intel \ |
16 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | 16 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" |
17 | 17 | ||
18 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" | 18 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index 5f8868de..e47c720c 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf | |||
@@ -31,6 +31,6 @@ APPEND += "console=ttyS0,115200 console=tty0" | |||
31 | # Add these only when Xserver is enabled with the EMGD driver | 31 | # Add these only when Xserver is enabled with the EMGD driver |
32 | # Otherwise unwanted X components will start showing up in the non-X images | 32 | # Otherwise unwanted X components will start showing up in the non-X images |
33 | VA_FEATURES ?= "gst-va-intel va-intel \ | 33 | VA_FEATURES ?= "gst-va-intel va-intel \ |
34 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | 34 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}" |
35 | 35 | ||
36 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 36 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |