[oe-commits] org.oe.dev mesa: refactor, add new .bb file for DRI drivers

[pb commit]

mesa: refactor, add new .bb file for DRI drivers

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 2dd5cca79f167b66d2877d7f896a777bd032cc4e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2dd5cca79f167b66d2877d7f896a777bd032cc4e
Files:
1
packages/mesa/mesa-common.inc
packages/mesa/mesa-dri_6.5.2.bb
packages/mesa/mesa-mesa.inc
packages/mesa/mesa_6.5.2.bb
Diffs:

#
# mt diff -r88e88c40e6907436116b97664408427032c712c4 -r2dd5cca79f167b66d2877d7f896a777bd032cc4e
#
# 
# 
# add_file "packages/mesa/mesa-common.inc"
#  content [162de3c4c91c1aa7fd8a010af7f07777fee8ce3c]
# 
# add_file "packages/mesa/mesa-dri_6.5.2.bb"
#  content [1299958d4dcad72309d4b58d318e700eac2a4aa0]
# 
# add_file "packages/mesa/mesa-mesa.inc"
#  content [b5c04b57417c9f743acc6cd41672c4412417d595]
# 
# patch "packages/mesa/mesa_6.5.2.bb"
#  from [d779eeebe8877f2d21e9b9fab9dcc782082dfe14]
#    to [d348f32f0ec1cf6bf44dcd4b257b348a64c35d4f]
# 
============================================================
--- packages/mesa/mesa-common.inc	162de3c4c91c1aa7fd8a010af7f07777fee8ce3c
+++ packages/mesa/mesa-common.inc	162de3c4c91c1aa7fd8a010af7f07777fee8ce3c
@@ -0,0 +1,9 @@
+SECTION = "x11"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+	file://mklib-rpath-link.patch;patch=1"
+S = "${WORKDIR}/Mesa-${PV}"
+
+LICENSE = "LGPL"
+
+DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
============================================================
--- packages/mesa/mesa-dri_6.5.2.bb	1299958d4dcad72309d4b58d318e700eac2a4aa0
+++ packages/mesa/mesa-dri_6.5.2.bb	1299958d4dcad72309d4b58d318e700eac2a4aa0
@@ -0,0 +1,37 @@
+include mesa-common.inc
+
+FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+PR = "r0"
+
+DEPENDS += "libdrm"
+
+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-mesa.inc	b5c04b57417c9f743acc6cd41672c4412417d595
+++ packages/mesa/mesa-mesa.inc	b5c04b57417c9f743acc6cd41672c4412417d595
@@ -0,0 +1,41 @@
+include mesa-common.inc
+
+PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+
+FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+do_configure() {
+	cd configs
+
+	ln -sf linux 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 glu glut/glx" >> current
+}
+
+do_compile() {
+	oe_runmake default
+}
+
+do_install() {
+	install -d ${D}${libdir}
+	cp -pP lib/* ${D}${libdir}/
+	install -d ${D}${includedir}
+	cp -R include/GL ${D}${includedir}/
+}
+
+do_stage() {
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
+}
============================================================
--- packages/mesa/mesa_6.5.2.bb	d779eeebe8877f2d21e9b9fab9dcc782082dfe14
+++ packages/mesa/mesa_6.5.2.bb	d348f32f0ec1cf6bf44dcd4b257b348a64c35d4f
@@ -1,50 +1,3 @@
-SECTION = "x11"
+PR = "r0"
 
+include mesa-mesa.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://mklib-rpath-link.patch;patch=1"
-S = "${WORKDIR}/Mesa-${PV}"
-
-LICENSE = "LGPL"
-
-RDEPENDS = "expat"
-DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
-
-PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
-
-FILES_libgl = "${libdir}/libGL.so.*"
-FILES_libglu = "${libdir}/libGLU.so.*"
-FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-
-FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
-FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
-FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
-
-do_configure() {
-	cd configs
-
-	ln -sf linux 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 glu glut/glx" >> current
-}
-
-do_compile() {
-	oe_runmake default
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	cp -pP lib/* ${D}${libdir}/
-	install -d ${D}${includedir}
-	cp -R include/GL ${D}${includedir}/
-}
-
-do_stage() {
-        cp -pP lib/* ${STAGING_LIBDIR}/
-        cp -R include/GL ${STAGING_INCDIR}/
-}