From 447a154399256e3dfc2ae366876098e4a5bd591d Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 28 Jan 2007 16:19:08 +0000 Subject: mesa: refactor, add new .bb file for DRI drivers --- packages/mesa/mesa-common.inc | 9 ++++++++ packages/mesa/mesa-dri_6.5.2.bb | 37 ++++++++++++++++++++++++++++++ packages/mesa/mesa-mesa.inc | 41 +++++++++++++++++++++++++++++++++ packages/mesa/mesa_6.5.2.bb | 51 ++--------------------------------------- 4 files changed, 89 insertions(+), 49 deletions(-) create mode 100644 packages/mesa/mesa-common.inc create mode 100644 packages/mesa/mesa-dri_6.5.2.bb create mode 100644 packages/mesa/mesa-mesa.inc (limited to 'packages/mesa') diff --git a/packages/mesa/mesa-common.inc b/packages/mesa/mesa-common.inc new file mode 100644 index 0000000000..18e9b4ebed --- /dev/null +++ b/packages/mesa/mesa-common.inc @@ -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" diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb new file mode 100644 index 0000000000..9255a926e9 --- /dev/null +++ b/packages/mesa/mesa-dri_6.5.2.bb @@ -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') +} + diff --git a/packages/mesa/mesa-mesa.inc b/packages/mesa/mesa-mesa.inc new file mode 100644 index 0000000000..a4163f576e --- /dev/null +++ b/packages/mesa/mesa-mesa.inc @@ -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}/ +} diff --git a/packages/mesa/mesa_6.5.2.bb b/packages/mesa/mesa_6.5.2.bb index 5cbc2bbc56..1c245f003b 100644 --- a/packages/mesa/mesa_6.5.2.bb +++ b/packages/mesa/mesa_6.5.2.bb @@ -1,50 +1,3 @@ -SECTION = "x11" +PR = "r0" -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}/ -} +include mesa-mesa.inc -- cgit v1.2.3