[oe-commits] org.oe.dev merge of '6973c76c103f69158263106e5945c463a17c9759'

[mickeyl commit]

merge of '6973c76c103f69158263106e5945c463a17c9759'
     and 'd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f22e68740932b52d4128634598e1377947560f47
ViewMTN: http://monotone.openembedded.org/revision/info/f22e68740932b52d4128634598e1377947560f47
Files:
1
packages/mesa/files/mklib-cross.patch
packages/mesa/mesa-dri_7.0.3.bb
packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
packages/mesa/mesa-dri_6.5.2.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
Diffs:

#
# mt diff -r6973c76c103f69158263106e5945c463a17c9759 -rf22e68740932b52d4128634598e1377947560f47
#
#
#
# add_file "packages/mesa/files/mklib-cross.patch"
#  content [5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457]
# 
# add_file "packages/mesa/mesa-dri_7.0.3.bb"
#  content [5d4a0c4a70a84c4f229000a50d59787d2df46405]
# 
# patch "packages/lirc/lirc-modules_0.8.3+cvs20080713.bb"
#  from [89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec]
#    to [2501f84812bd4886c523ca926fa3ba6f73412213]
# 
# patch "packages/mesa/mesa-dri_6.5.2.bb"
#  from [52f888551f42e13c2bbb0e72aacb6e76e146ab4b]
#    to [9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8]
#
============================================================
--- packages/mesa/files/mklib-cross.patch	5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
+++ packages/mesa/files/mklib-cross.patch	5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
@@ -0,0 +1,14 @@
+--- s/bin/mklib~	2008-02-19 15:30:18.000000000 +0000
++++ s/bin/mklib	2008-07-27 11:15:25.000000000 +0100
+@@ -204,9 +204,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+ 
============================================================
--- packages/mesa/mesa-dri_7.0.3.bb	5d4a0c4a70a84c4f229000a50d59787d2df46405
+++ packages/mesa/mesa-dri_7.0.3.bb	5d4a0c4a70a84c4f229000a50d59787d2df46405
@@ -0,0 +1,42 @@
+include mesa-common.inc
+
+# suppress mklib-rpath-link patch from mesa-common
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+
+FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+PR = "r0"
+
+DEPENDS += "libdrm"
+# DRI is useless without the kernel drivers
+RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
+
+do_configure() {
+	cd configs
+
+	ln -sf linux-dri current
+	sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+	sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+	sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+	sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+	sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+	sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+	sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
+	echo "SRC_DIRS = mesa" >> current
+	echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
+}
+
+do_install() {
+	oe_runmake -C src/mesa/drivers/dri install
+}
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
+
+python populate_packages_prepend () {
+        import re, os.path
+
+        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+}
+
============================================================
--- packages/lirc/lirc-modules_0.8.3+cvs20080713.bb	89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec
+++ packages/lirc/lirc-modules_0.8.3+cvs20080713.bb	2501f84812bd4886c523ca926fa3ba6f73412213
@@ -16,7 +16,7 @@ require lirc-config.inc
 
 require lirc-config.inc
 
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers"
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make V=1' -C drivers"
 
 fakeroot do_install() {
 	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
============================================================
--- packages/mesa/mesa-dri_6.5.2.bb	52f888551f42e13c2bbb0e72aacb6e76e146ab4b
+++ packages/mesa/mesa-dri_6.5.2.bb	9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8
@@ -1,5 +1,7 @@ include mesa-common.inc
 include mesa-common.inc
 
+SRC_URI += " file://mklib-cross.patch;patch=1"
+
 FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"


#
# mt diff -rd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc -rf22e68740932b52d4128634598e1377947560f47
#
#
#
# patch "conf/distro/include/moko-autorev.inc"
#  from [37caae48109ecf51cac36b99d1c159bf899e43a0]
#    to [94e55ff2e17a2b6a78e02b39d7246a1ee7dbe9b0]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [1f2ab31eceb6206825c9568b313ab48c224c8863]
#    to [2bfeeb7d101578d2eb6340c6d44b4de3c211d7bd]
#
============================================================
--- conf/distro/include/moko-autorev.inc	37caae48109ecf51cac36b99d1c159bf899e43a0
+++ conf/distro/include/moko-autorev.inc	94e55ff2e17a2b6a78e02b39d7246a1ee7dbe9b0
@@ -3,6 +3,7 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-exposure ?= "${AUTOREV}"
 SRCREV_pn-illume ?= "${AUTOREV}"
 SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc	1f2ab31eceb6206825c9568b313ab48c224c8863
+++ conf/distro/include/sane-srcdates.inc	2bfeeb7d101578d2eb6340c6d44b4de3c211d7bd
@@ -1,4 +1,5 @@
-# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version 
+# Lock down some SRCDATEs
+# See http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version 
 
 # Kernel modules
 SRCDATE_at76c503a-modules ?= "20060814"