diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2010-12-20 12:24:36 -0600 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-23 14:20:50 +0000 |
commit | eca21e63590c165c5aaf14cbd51c7f325b731aba (patch) | |
tree | e04b863b4a355e46a6ce526caf6dcc98713eb620 /meta-emenlow/recipes/xpsb-glx | |
parent | ab83f5f266ee7f66d14e3711ec84907750ea7e91 (diff) | |
download | openembedded-core-eca21e63590c165c5aaf14cbd51c7f325b731aba.tar.gz openembedded-core-eca21e63590c165c5aaf14cbd51c7f325b731aba.tar.bz2 openembedded-core-eca21e63590c165c5aaf14cbd51c7f325b731aba.tar.xz openembedded-core-eca21e63590c165c5aaf14cbd51c7f325b731aba.zip |
meta-emenlow: update to the new BSP layout
This modifies the meta-emenlow BSP layer to reflect the new BSP
standard layout as defined in the latestYocto BSP Developer's Guide.
There's no change in functionality here - this simply moves things
around, adds a README, and makes the SRCREVs local.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/recipes/xpsb-glx')
4 files changed, 0 insertions, 187 deletions
diff --git a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/cross-compile.patch b/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/cross-compile.patch deleted file mode 100644 index a23159681..000000000 --- a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: mesa/configs/linux-dri -=================================================================== ---- mesa.orig/configs/linux-dri -+++ mesa/configs/linux-dri -@@ -3,11 +3,9 @@ - - include $(TOP)/configs/default - --CONFIG_NAME = linux-dri -+$(warning ENVIRONMENT = $(shell printenv)) - --# Compiler and flags --CC = gcc --CXX = g++ -+CONFIG_NAME = linux-dri - - #MKDEP = /usr/X11R6/bin/makedepend - #MKDEP = gcc -M -@@ -25,8 +23,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU - -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ - -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN - --X11_INCLUDES = -I/usr/X11R6/include -- - CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ - $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) - -@@ -40,9 +36,6 @@ CXXFLAGS += -fno-strict-aliasing - - ASM_SOURCES = - --# Library/program dependencies --EXTRA_LIB_PATH=-L/usr/X11R6/lib -- - LIBDRM_CFLAGS = `pkg-config --cflags libdrm-poulsbo` - LIBDRM_LIB = `pkg-config --libs libdrm-poulsbo` - DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -Index: mesa/configs/default -=================================================================== ---- mesa.orig/configs/default -+++ mesa/configs/default -@@ -17,8 +17,6 @@ MESA_VERSION = $(MESA_MAJOR).$(MESA_MINO - DRM_SOURCE_PATH=$(TOP)/../drm - - # Compiler and flags --CC = cc --CXX = CC - CFLAGS = -O - CXXFLAGS = -O - LDFLAGS = -@@ -67,7 +65,6 @@ ASM_SOURCES = - # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in - # order to build the Motif widget too) - GLW_SOURCES = GLwDrawA.c --MOTIF_CFLAGS = -I/usr/include/Motif1.2 - - - # Directories to build diff --git a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/libdrmname.patch b/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/libdrmname.patch deleted file mode 100644 index 96b94ef2c..000000000 --- a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/libdrmname.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: mesa/configure.ac -=================================================================== ---- mesa.orig/configure.ac 2010-05-13 13:20:26.000000000 +0100 -+++ mesa/configure.ac 2010-07-25 17:02:58.000000000 +0100 -@@ -524,10 +524,10 @@ - fi - - # Check for libdrm -- PKG_CHECK_MODULES([LIBDRM], [libdrm-poulsbo >= $LIBDRM_REQUIRED]) -+ PKG_CHECK_MODULES([LIBDRM], [libdrm_poulsbo >= $LIBDRM_REQUIRED]) - PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) -- GL_PC_REQ_PRIV="libdrm-poulsbo >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" -- DRI_PC_REQ_PRIV="libdrm-poulsbo >= $LIBDRM_REQUIRED" -+ GL_PC_REQ_PRIV="libdrm_poulsbo >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" -+ DRI_PC_REQ_PRIV="libdrm_poulsbo >= $LIBDRM_REQUIRED" - - # find the DRI deps for libGL - if test "$x11_pkgconfig" = yes; then -Index: mesa/configs/linux-dri -=================================================================== ---- mesa.orig/configs/linux-dri 2010-07-25 17:08:01.000000000 +0100 -+++ mesa/configs/linux-dri 2010-07-25 17:08:17.000000000 +0100 -@@ -36,8 +36,8 @@ - - ASM_SOURCES = - --LIBDRM_CFLAGS = `pkg-config --cflags libdrm-poulsbo` --LIBDRM_LIB = `pkg-config --libs libdrm-poulsbo` -+LIBDRM_CFLAGS = `pkg-config --cflags libdrm_poulsbo` -+LIBDRM_LIB = `pkg-config --libs libdrm_poulsbo` - DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -lpthread -ldl $(LIBDRM_LIB) -Index: mesa/configs/linux-dri-xcb -=================================================================== ---- mesa.orig/configs/linux-dri-xcb 2010-07-25 17:08:25.000000000 +0100 -+++ mesa/configs/linux-dri-xcb 2010-07-25 17:08:44.000000000 +0100 -@@ -41,8 +41,8 @@ - # Library/program dependencies - EXTRA_LIB_PATH=`pkg-config --libs-only-L x11` - --LIBDRM_CFLAGS = `pkg-config --cflags libdrm-poulsbo` --LIBDRM_LIB = `pkg-config --libs libdrm-poulsbo` -+LIBDRM_CFLAGS = `pkg-config --cflags libdrm_poulsbo` -+LIBDRM_LIB = `pkg-config --libs libdrm_poulsbo` - DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -lpthread -ldl $(LIBDRM_LIB) `pkg-config --libs xcb` \ -Index: mesa/configs/linux-solo -=================================================================== ---- mesa.orig/configs/linux-solo 2010-07-25 17:09:03.000000000 +0100 -+++ mesa/configs/linux-solo 2010-07-25 17:09:13.000000000 +0100 -@@ -16,8 +16,8 @@ - ARCH_FLAGS ?= - - # DRM and pciaccess --LIBDRM_CFLAGS = `pkg-config --cflags libdrm-poulsbo` --LIBDRM_LIB = `pkg-config --libs libdrm-poulsbo` -+LIBDRM_CFLAGS = `pkg-config --cflags libdrm_poulsbo` -+LIBDRM_LIB = `pkg-config --libs libdrm_poulsbo` - PCIACCESS_CFLAGS = `pkg-config --cflags pciaccess` - PCIACCESS_LIB = `pkg-config --libs pciaccess` - diff --git a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/native-matypes.patch b/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/native-matypes.patch deleted file mode 100644 index 26b1f52a3..000000000 --- a/meta-emenlow/recipes/xpsb-glx/xpsb-glx-0.18/native-matypes.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: mesa/src/mesa/x86/Makefile -=================================================================== ---- mesa.orig/src/mesa/x86/Makefile 2010-10-11 16:34:12.664960996 +0100 -+++ mesa/src/mesa/x86/Makefile 2010-10-11 16:34:43.854960861 +0100 -@@ -20,11 +20,12 @@ - -rm -f matypes.h gen_matypes - - --gen_matypes: gen_matypes.c -- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes -+#gen_matypes: gen_matypes.c -+# $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes - - # need some special rules here, unfortunately --matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes -+matypes.h: ../main/mtypes.h ../tnl/t_context.h -+# gen_matypes - ./gen_matypes > matypes.h - - common_x86_asm.o: matypes.h diff --git a/meta-emenlow/recipes/xpsb-glx/xpsb-glx_0.18.bb b/meta-emenlow/recipes/xpsb-glx/xpsb-glx_0.18.bb deleted file mode 100644 index 6ceb1cbe0..000000000 --- a/meta-emenlow/recipes/xpsb-glx/xpsb-glx_0.18.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "X11 drivers for Poulsbo (psb) 3D acceleration" - -# There's a mesa implementation in this package, which is presumably -# not Intel proprietary, but it has no obvious license attached to it. -LICENSE = "Intel-binary-only" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=02c597a2f082b4581596065bb5a521a8" -PR = "r6" - -inherit autotools - -PROVIDES = "virtual/libgl mesa-dri" - -SRC_URI="https://launchpad.net/~gma500/+archive/ppa/+files/xpsb-glx_0.18-0ubuntu1netbook2~1004um1ubuntu1.tar.gz \ - file://cross-compile.patch \ - file://libdrmname.patch \ - file://native-matypes.patch" - -do_configure () { - chmod +x autogen.sh && ./autogen.sh ${CONFIGUREOPTS} && make realclean - cd ${S}/src/mesa/x86/ - ${BUILD_CC} -I../../../include/GL -I../../../include -I.. -I../main -I../math -I../glapi -I../tnl -Wall -Wmissing-prototypes -std=c99 -ffast-math -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -fno-strict-aliasing gen_matypes.c -o gen_matypes -} - -do_install() { - make DESTDIR=${D} install - install -d -m 0755 ${D}/${libdir}/xorg/modules/dri \ - ${D}/${libdir}/xorg/modules/drivers - install -m 0644 ${WORKDIR}/${PN}-${PV}/dri/* \ - ${D}/${libdir}/xorg/modules/dri - install -m 0644 ${WORKDIR}/${PN}-${PV}/drivers/* \ - ${D}/${libdir}/xorg/modules/drivers -} - -S = "${WORKDIR}/${PN}-${PV}/mesa" - -EXTRA_OEMAKE = "linux-dri-x86" - -DEPENDS += "libdrm-poulsbo libxxf86vm dri2proto libxmu libxi glproto makedepend-native" - -FILES_${PN} = "${libdir}/* ${libdir}/xorg/modules/dri/* \ - ${libdir}/xorg/modules/drivers/*" - -# Multiple virtual/gl providers being built breaks staging -EXCLUDE_FROM_WORLD = "1" - -COMPATIBLE_MACHINE = "emenlow" |