Merge branch 'master' of ssh://git.pokylinux.org/meta-intel

6 files changed, 37 insertions, 9 deletions

diff --git a/meta-crownbay/recipes-gnome/gtk+/gtk+_2.22.1.bbappend b/meta-crownbay/recipes-gnome/gtk+/gtk+_2.22.1.bbappend
index 6efeb5c4..d20e2334 100644
--- a/meta-crownbay/recipes-gnome/gtk+/gtk+_2.22.1.bbappend
+++ b/meta-crownbay/recipes-gnome/gtk+/gtk+_2.22.1.bbappend
@@ -1,2 +1,5 @@
+PR .= ".1"
+
 #-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on crownbay
 FULL_OPTIMIZATION_crownbay = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
+FULL_OPTIMIZATION_crownbay-noemgd = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb
index 5f22213a..01f0a244 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb
@@ -15,8 +15,8 @@ SRC_URI += "file://nodolt.patch \
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
-SRC_URI[md5sum] = "5c8773499a6a8c1ddaedf33577ec9634"
-SRC_URI[sha256sum] = "8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34"
+SRC_URI[md5sum] = "cafc4e2d4ef6cf6e47f3e7dffeb3346a"
+SRC_URI[sha256sum] = "a89f13b166b412930fe418ff50032dd2cde8bb181d8b47b5ca6f848d218fdcf2"
 
 RDEPENDS_${PN} += "xserver-xf86-emgd-bin mesa-dri"
 
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index e663a4e1..f92ffcd7 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -46,9 +46,5 @@ PREFERRED_VERSION_grub ?= "1.98"
 
 TARGET_CC_ARCH = "-m64"
 
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "e2cabadc059ad8d91f7e4a023106620d93abd23a"
-
-SRCREV_machine_pn-linux-yocto-stable_jasperforest ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
-SRCREV_meta_pn-linux-yocto-stable_jasperforest ?= "50ccd2b3213b6a1bacb3f898c035119802dac420"
-
+SRCREV_machine_pn-linux-yocto_jasperforest ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
+SRCREV_meta_pn-linux-yocto_jasperforest ?= "212cae404e57ff9dc58c808035770d51325c3512"
diff --git a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf
new file mode 100644
index 00000000..e18b9111
--- /dev/null
+++ b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier    "Intel Graphics Driver"
+    Driver        "intel"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Intel Graphics Driver"
+    Monitor        "Generic Monitor"
+    DefaultDepth    24
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices" "False"
+EndSection
diff --git a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
new file mode 100644
index 00000000..4b8d0e65
--- /dev/null
+++ b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -0,0 +1,3 @@
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 92d7c542..00534a5b 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -28,7 +28,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-intel \
            mesa-dri \
-           mesa-dri-driver-i915"
+           mesa-dri-driver-i965"
 
 SERIAL_CONSOLE = "115200 ttyS0"