[oe-commits] org.oe.dev mesa-dri: fix 6.5.2 cross compilation error, add 7.0.3

[pb commit]

mesa-dri: fix 6.5.2 cross compilation error, add 7.0.3

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: d31c1295bcd5944462101e7edc3683efc7cec44b
ViewMTN: http://monotone.openembedded.org/revision/info/d31c1295bcd5944462101e7edc3683efc7cec44b
Files:
1
packages/mesa/files/mklib-cross.patch
packages/mesa/mesa-dri_7.0.3.bb
packages/mesa/mesa-dri_6.5.2.bb
Diffs:

#
# mt diff -rddb3262e0fe9acfe7d20567e33ef27bcfe0d0801 -rd31c1295bcd5944462101e7edc3683efc7cec44b
#
#
#
# add_file "packages/mesa/files/mklib-cross.patch"
#  content [5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457]
# 
# add_file "packages/mesa/mesa-dri_7.0.3.bb"
#  content [5d4a0c4a70a84c4f229000a50d59787d2df46405]
# 
# 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/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-*"