diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-30 16:55:14 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-30 16:55:14 +0200 |
commit | 74effe15d6178372c13cf29e8446620e62956179 (patch) | |
tree | e4e976c23d8d43bbc7457ed6e7bc6f384bb7a573 /recipes/mesa | |
parent | f793b885ddb83aaec66b4dd5bf04ce5abc0a7709 (diff) | |
parent | bc81e417ed196435e43ee540d4a743f8931ae19b (diff) | |
download | openembedded-74effe15d6178372c13cf29e8446620e62956179.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/unstable
Conflicts:
recipes/mesa/mesa-dri-glsl-native.bb
recipes/u-boot/u-boot_git.bb
Diffstat (limited to 'recipes/mesa')
-rw-r--r-- | recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch | 81 | ||||
-rw-r--r-- | recipes/mesa/mesa-dri-glsl-native.bb | 22 | ||||
-rw-r--r-- | recipes/mesa/mesa-dri-glsl-native_7.8.bb | 20 | ||||
-rw-r--r-- | recipes/mesa/mesa-dri_7.8.bb | 37 |
4 files changed, 138 insertions, 22 deletions
diff --git a/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch b/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch new file mode 100644 index 0000000000..40e6a1b16e --- /dev/null +++ b/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch @@ -0,0 +1,81 @@ +From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 4 Mar 2010 14:16:27 +0100 +Subject: [PATCH] fix libs + +--- + progs/demos/Makefile | 2 +- + progs/glsl/Makefile | 2 +- + progs/redbook/Makefile | 2 +- + progs/samples/Makefile | 2 +- + progs/xdemos/Makefile | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/progs/demos/Makefile b/progs/demos/Makefile +index 5b1d2a0..121b862 100644 +--- a/progs/demos/Makefile ++++ b/progs/demos/Makefile +@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \ + $(APP_LIB_DEPS) + + PROGS = \ +diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile +index 3b5a595..836c4ac 100644 +--- a/progs/glsl/Makefile ++++ b/progs/glsl/Makefile +@@ -10,7 +10,7 @@ LIB_DEP = \ + $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \ ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \ + -l$(GL_LIB) $(APP_LIB_DEPS) + + # using : to avoid APP_CC pointing to CC loop +diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile +index b41e488..95ed746 100644 +--- a/progs/redbook/Makefile ++++ b/progs/redbook/Makefile +@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS) + + PROGS = aaindex \ + aapoly \ +diff --git a/progs/samples/Makefile b/progs/samples/Makefile +index 64fa47a..9f72c8b 100644 +--- a/progs/samples/Makefile ++++ b/progs/samples/Makefile +@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS) + + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ + font line logo nurb olympic overlay point prim rgbtoppm quad select \ +diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile +index f866a32..c0f4e06 100644 +--- a/progs/xdemos/Makefile ++++ b/progs/xdemos/Makefile +@@ -11,7 +11,7 @@ + # Add X11 and pthread libs to satisfy GNU gold. + APP_LIB_DEPS += -lX11 -lpthread + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) -lstdc++ $(APP_LIB_DEPS) + + PROGS = \ + corender \ +-- +1.7.0 + diff --git a/recipes/mesa/mesa-dri-glsl-native.bb b/recipes/mesa/mesa-dri-glsl-native.bb deleted file mode 100644 index 033ded96f9..0000000000 --- a/recipes/mesa/mesa-dri-glsl-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -inherit native - -PV = "7.7.999" -PR = "0" -PR_append = "+gitr${SRCPV}" - -DEPENDS = "makedepend-native" - -SRCREV = "f88b43e8d09bf359e7d5770b133cb433b25f9848" - -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" - -S = "${WORKDIR}/git/src/glsl/" - -do_configure_prepend() { - ln -s ${S}/../../configs/default ${S}/../../configs/current -} - -do_stage() { - install -d ${bindir} - install -m 755 ${S}/apps/compile ${bindir}/glsl-compile -} diff --git a/recipes/mesa/mesa-dri-glsl-native_7.8.bb b/recipes/mesa/mesa-dri-glsl-native_7.8.bb new file mode 100644 index 0000000000..eef573317a --- /dev/null +++ b/recipes/mesa/mesa-dri-glsl-native_7.8.bb @@ -0,0 +1,20 @@ +inherit native + +PR = "0" + +DEPENDS = "makedepend-native" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive" +SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b" +SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35" + +S = "${WORKDIR}/Mesa-7.8/src/glsl/" + +do_configure_prepend() { + ln -s ${S}/../../configs/default ${S}/../../configs/current +} + +do_stage() { + install -d ${bindir} + install -m 755 ${S}/apps/compile ${bindir}/glsl-compile +} diff --git a/recipes/mesa/mesa-dri_7.8.bb b/recipes/mesa/mesa-dri_7.8.bb new file mode 100644 index 0000000000..f0d86ed04f --- /dev/null +++ b/recipes/mesa/mesa-dri_7.8.bb @@ -0,0 +1,37 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto expat" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native mesa-dri-glsl-native" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \ + file://fix-progs-makefile.patch;patch=1 \ + " +SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b" +SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35" +SRC_URI[demos.md5sum] = "9fe8ec184c7f78691e43c4c0a7f97d56" +SRC_URI[demos.sha256sum] = "5bf65f03ddcd04b02e9ca044285f8754decee67eb274191da1f31627f1d84b0e" + +PR = "${INC_PR}.0" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# ASUS EeePC 901 has DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_eee901 = "1" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" +EXTRA_OECONF_shr += "--with-driver=dri --disable-glx-tls --disable-gallium --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" + +# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" +do_configure_prepend() { + sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile +} |