mesa3d: pull out from x11

mesa3d does not depend on x11, it can be used by wayland or other apps

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index 8c2c70002524bba9ac4831eb64013d86b097dfdc..e81660367448e730f669780f2c78b32ce3cc540e 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -190,6 +190,7 @@ source "package/fbv/Config.in"
 source "package/imagemagick/Config.in"
 source "package/linux-fusion/Config.in"
 source "package/lite/Config.in"
+source "package/mesa3d/Config.in"
 source "package/ocrad/Config.in"
 source "package/psplash/Config.in"
 source "package/sawman/Config.in"

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
new file mode 100644 (file)
index 0000000..0ce168e
--- /dev/null
+++ b/package/mesa3d/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_MESA3D
+       bool "Mesa 3D Graphics Library"
+       select BR2_PACKAGE_XPROTO_GLPROTO
+       select BR2_PACKAGE_XLIB_LIBXXF86VM
+       select BR2_PACKAGE_XLIB_LIBXDAMAGE
+       select BR2_PACKAGE_XLIB_LIBXFIXES
+       select BR2_PACKAGE_XPROTO_DRI2PROTO
+       select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_EXPAT
+       select BR2_PACKAGE_HOST_LIBXML2_PYTHON
+       depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+       depends on BR2_INSTALL_LIBSTDCPP
+       help
+         Mesa 3D, an open-source implementation of the OpenGL specification.

diff --git a/package/mesa3d/mesa3d-uclibc-locale.patch b/package/mesa3d/mesa3d-uclibc-locale.patch
new file mode 100644 (file)
index 0000000..99afe8d
--- /dev/null
+++ b/package/mesa3d/mesa3d-uclibc-locale.patch
@@ -0,0 +1,56 @@
+[PATCH] Fix compilation on uClibc without locale support
+
+Based on similar patch from OE:
+
+http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac            |    3 +++
+ src/glsl/strtod.c       |    2 +-
+ src/mesa/main/imports.c |    2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fbaa376..454dad2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS])
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+ 
++dnl See if newlocale is available
++AC_CHECK_FUNCS_ONCE(newlocale)
++
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+     [AS_HELP_STRING([--enable-selinux],
+diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
+index a876e13..9fce7e9 100644
+--- a/src/glsl/strtod.c
++++ b/src/glsl/strtod.c
+@@ -44,7 +44,7 @@ double
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
+index d3727ef..363bf32 100644
+--- a/src/mesa/main/imports.c
++++ b/src/mesa/main/imports.c
+@@ -757,7 +757,7 @@ float
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-- 
+1.7.10.4
+

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
new file mode 100644 (file)
index 0000000..d4080d4
--- /dev/null
+++ b/package/mesa3d/mesa3d.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# mesa3d
+#
+################################################################################
+
+MESA3D_VERSION = 7.10.3
+MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION)
+MESA3D_LICENSE = MIT, SGI, Khronos
+MESA3D_LICENSE_FILES = docs/license.html
+
+MESA3D_AUTORECONF = YES
+MESA3D_INSTALL_STAGING = YES
+
+MESA3D_CONF_OPT = \
+       --disable-egl \
+       --disable-glu \
+       --disable-glw \
+       --disable-glut \
+       --disable-gallium \
+       --with-driver=dri \
+       --with-dri-drivers=swrast \
+       --disable-static
+
+MESA3D_DEPENDENCIES = \
+       xproto_glproto \
+       xlib_libXxf86vm \
+       xlib_libXdamage \
+       xlib_libXfixes \
+       xproto_dri2proto \
+       libdrm \
+       expat \
+       host-xutil_makedepend \
+       host-libxml2 \
+       host-python \
+       host-bison \
+       host-flex
+
+$(eval $(autotools-package))

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 5ef118b8703366b54c9f26836953495763848878..458d09fed70c8b226710eaebd0d7921d4019dfa5 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -15,7 +15,6 @@ if BR2_PACKAGE_XORG7
        endmenu
        menu "X11R7 Libraries"
                source package/x11r7/libxcb/Config.in
-               source package/x11r7/mesa3d/Config.in
                source package/x11r7/xcb-util/Config.in
                source package/x11r7/xcb-util-image/Config.in
                source package/x11r7/xcb-util-keysyms/Config.in

diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
deleted file mode 100644 (file)
index 0ce168e..0000000
--- a/package/x11r7/mesa3d/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_MESA3D
-       bool "Mesa 3D Graphics Library"
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XLIB_LIBXXF86VM
-       select BR2_PACKAGE_XLIB_LIBXDAMAGE
-       select BR2_PACKAGE_XLIB_LIBXFIXES
-       select BR2_PACKAGE_XPROTO_DRI2PROTO
-       select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_EXPAT
-       select BR2_PACKAGE_HOST_LIBXML2_PYTHON
-       depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-       depends on BR2_INSTALL_LIBSTDCPP
-       help
-         Mesa 3D, an open-source implementation of the OpenGL specification.

diff --git a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch b/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
deleted file mode 100644 (file)
index 99afe8d..0000000
--- a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] Fix compilation on uClibc without locale support
-
-Based on similar patch from OE:
-
-http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac            |    3 +++
- src/glsl/strtod.c       |    2 +-
- src/mesa/main/imports.c |    2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fbaa376..454dad2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS])
- dnl See if posix_memalign is available
- AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
- 
-+dnl See if newlocale is available
-+AC_CHECK_FUNCS_ONCE(newlocale)
-+
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
-     [AS_HELP_STRING([--enable-selinux],
-diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
-index a876e13..9fce7e9 100644
---- a/src/glsl/strtod.c
-+++ b/src/glsl/strtod.c
-@@ -44,7 +44,7 @@ double
- double
- glsl_strtod(const char *s, char **end)
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
-    static locale_t loc = NULL;
-    if (!loc) {
-       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
-index d3727ef..363bf32 100644
---- a/src/mesa/main/imports.c
-+++ b/src/mesa/main/imports.c
-@@ -757,7 +757,7 @@ float
- float
- _mesa_strtof( const char *s, char **end )
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
-    static locale_t loc = NULL;
-    if (!loc) {
-       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
--- 
-1.7.10.4
-

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
deleted file mode 100644 (file)
index d4080d4..0000000
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#
-# mesa3d
-#
-################################################################################
-
-MESA3D_VERSION = 7.10.3
-MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
-MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION)
-MESA3D_LICENSE = MIT, SGI, Khronos
-MESA3D_LICENSE_FILES = docs/license.html
-
-MESA3D_AUTORECONF = YES
-MESA3D_INSTALL_STAGING = YES
-
-MESA3D_CONF_OPT = \
-       --disable-egl \
-       --disable-glu \
-       --disable-glw \
-       --disable-glut \
-       --disable-gallium \
-       --with-driver=dri \
-       --with-dri-drivers=swrast \
-       --disable-static
-
-MESA3D_DEPENDENCIES = \
-       xproto_glproto \
-       xlib_libXxf86vm \
-       xlib_libXdamage \
-       xlib_libXfixes \
-       xproto_dri2proto \
-       libdrm \
-       expat \
-       host-xutil_makedepend \
-       host-libxml2 \
-       host-python \
-       host-bison \
-       host-flex
-
-$(eval $(autotools-package))