# HG changeset patch # User Christophe Lincoln # Date 1396190284 -7200 # Node ID 167df68aa30352c1bd2f4bd809ccb8de09d66f65 # Parent 2a3776157b634728f1309276e40bcc17b50ce2c7 Add mesa-wayland diff -r 2a3776157b63 -r 167df68aa303 mesa-wayland-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mesa-wayland-dev/receipt Sun Mar 30 16:38:04 2014 +0200 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="mesa-wayland-dev" +VERSION="1.4.0" +CATEGORY="development" +SHORT_DESC="Wayland X server devel files." +MAINTAINER="pankso@slitaz.org" +LICENSE="MIT" +WANTED="mesa-wayland" +WEB_SITE="http://www.mesa3d.org/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/dri + cp -a $install/usr/include $fs/usr + cp -a $install/usr/lib/*.*a $fs/usr/lib + cp -a $install/usr/lib/dri/*.*a $fs/usr/lib/dri + cp -a $install/usr/lib/pkgconfig $fs/usr/lib +} diff -r 2a3776157b63 -r 167df68aa303 mesa-wayland/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mesa-wayland/receipt Sun Mar 30 16:38:04 2014 +0200 @@ -0,0 +1,58 @@ +# SliTaz package receipt. + +PACKAGE="mesa-wayland" +VERSION="9.1.3" +CATEGORY="x-window" +SHORT_DESC="3D Graphics Library that is an open-source implementaton of OpenGL." +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="MIT" +SUGGESTED="nvidia" +SOURCE="Mesa" +TARBALL="${SOURCE}Lib-$VERSION.tar.bz2" +WEB_SITE="http://www.mesa3d.org/" +WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$TARBALL" + +# Have Wayland support by default ? +PROVIDE="libgl libegl-mesa libglw-mesa libglu-mesa" + +DEPENDS="expat libdrm xorg-libXdamage xorg-libXxf86vm xorg-libXt udev \ +wayland" +BUILD_DEPENDS="expat-dev libdrm-dev xorg-libXdamage-dev pkg-config \ +xorg-libXxf86vm-dev xorg-libXt-dev xorg-dri2proto xorg-glproto \ +talloc xorg-makedepend lesstif libxml2-python xorg-imake lesstif-dev \ +xorg-server-dev udev-dev file libdrm-nouveau llvm libtool automake \ +autoconf libpthread-stubs-dev wayland-dev" + +# Rules to configure and make the package. +compile_rules() +{ + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc/X11/${PACKAGE} \ + --enable-gles2 \ + --disable-gallium-egl \ + --with-egl-platforms=x11,wayland,drm \ + --enable-gbm \ + --enable-shared-glapi \ + --with-gallium-drivers=r300,r600,swrast,nouveau \ + $CONFIGURE_ARGS && + make $MAKEFLAGS && make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/dri + cp -a $install/etc $fs + cp -a $install/usr/lib/*.so* $fs/usr/lib + cp -a $install/usr/lib/dri/*.so* $fs/usr/lib/dri + + # libGLU is included in the package libglu-mesa + #rm -r -f $fs/usr/lib/libGLU* + + #libGLw is included in the package libglw-mesa + #rm -r -f $fs/usr/lib/libGLw* + + #libEGL is included in the package libegl-mesa + #rm -r -f $fs/usr/lib/libEGL* +} diff -r 2a3776157b63 -r 167df68aa303 mesa-wayland/stuff/nouveau-fix-header.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mesa-wayland/stuff/nouveau-fix-header.patch Sun Mar 30 16:38:04 2014 +0200 @@ -0,0 +1,86 @@ +From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs +Date: Mon, 20 Dec 2010 03:39:36 +0000 +Subject: nouveau: fix includes for latest libdrm + +Signed-off-by: Ben Skeggs +--- +diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h +index ab480ca..747b084 100644 +--- a/src/gallium/drivers/nouveau/nouveau_winsys.h ++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h +@@ -10,7 +10,7 @@ + #include "nouveau/nouveau_grobj.h" + #include "nouveau/nouveau_notifier.h" + #include "nouveau/nouveau_resource.h" +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + #ifndef NV04_PFIFO_MAX_PACKET_LEN + #define NV04_PFIFO_MAX_PACKET_LEN 2047 +diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c +index ce48022..a99df76 100644 +--- a/src/gallium/drivers/nv50/nv50_surface.c ++++ b/src/gallium/drivers/nv50/nv50_surface.c +@@ -22,7 +22,7 @@ + + #define __NOUVEAU_PUSH_H__ + #include +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + #include "nv50_context.h" + #include "nv50_resource.h" + #include "pipe/p_defines.h" +diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c +index e0e65e7..e2fadd3 100644 +--- a/src/gallium/drivers/nvfx/nv04_2d.c ++++ b/src/gallium/drivers/nvfx/nv04_2d.c +@@ -34,11 +34,11 @@ + #include + #include + #include +-#include + #include + #include + #include + #include ++#include + #include "nv04_2d.h" + + #include "nouveau/nv_object.xml.h" +diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c +index 597664e..339b317 100644 +--- a/src/gallium/drivers/nvfx/nvfx_vbo.c ++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c +@@ -9,8 +9,7 @@ + #include "nvfx_resource.h" + + #include "nouveau/nouveau_channel.h" +- +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + static inline unsigned + util_guess_unique_indices_count(unsigned mode, unsigned indices) +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +index 8036b18..c5ac128 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +@@ -38,7 +38,6 @@ + #include + + #include "nouveau_device.h" +-#include "nouveau_pushbuf.h" + #include "nouveau_grobj.h" + #include "nouveau_channel.h" + #include "nouveau_bo.h" +@@ -46,6 +45,7 @@ + #include "nouveau_screen.h" + #include "nouveau_state.h" + #include "nouveau_surface.h" ++#include "nv04_pushbuf.h" + + #define DRIVER_DATE "20091015" + #define DRIVER_AUTHOR "Nouveau" +-- +cgit v0.8.3-6-g21f6