./packages/libreoffice/3.3.0/experimental r2270: fix mesa header check
------------------------------------------------------------
revno: 2270
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2010-12-30 00:11:09 +0100
message:
fix mesa header check
added:
patches/fix-mesa-headers-check.diff
modified:
changelog
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-12-29 21:26:46 +0000
+++ b/changelog 2010-12-29 23:11:09 +0000
@@ -1,9 +1,15 @@
libreoffice (1:3.3.0~rc2-3) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * merge OOo lenny-backport fixes
- + keep 3.0 (quilt) for lenny-backports now that it supports it
- + really use internal mythes
+ * debian/patches/fix-mesa-headers-check.diff: backport fix from
+ master: check for mesaa headers only when OpenGL disabled. Fixes FTBFS
+ on arm(el)/mips(el)
+
+ * debian/rules
+ - merge OOo lenny-backport fixes
+ + keep 3.0 (quilt) for lenny-backports now that it supports it
+ + really use internal mythes
+ - add explicit --with-system-mesa-headers
[ Matthias Klose ]
* debian/rules:
@@ -11,7 +17,7 @@
- Move architecture specific config before distro specific config.
- Add build support for dh_python2.
- -- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 18:25:14 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 23:57:14 +0100
libreoffice (1:3.3.0~rc2-2) experimental; urgency=low
=== added file 'patches/fix-mesa-headers-check.diff'
--- a/patches/fix-mesa-headers-check.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-mesa-headers-check.diff 2010-12-29 23:11:09 +0000
@@ -0,0 +1,104 @@
+--- /dev/null 2010-12-28 14:11:38.191102592 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/fix-mesa-headers-check.diff 2010-12-29 21:25:14.000000000 +0100
+@@ -0,0 +1,90 @@
++diff --git a/configure.in b/configure.in
++index e431cbf..5fbe4d3 100644
++--- configure.in
+++++ configure.in
++@@ -5564,26 +5564,6 @@
++ AC_SUBST(ENABLE_RANDR)
++
++ dnl ===================================================================
++-dnl Check for system Mesa
++-dnl ===================================================================
++-AC_MSG_CHECKING([which Mesa headers to use])
++-if test "$with_system_mesa_headers" = "no"; then
++- AC_MSG_RESULT([internal])
++- SYSTEM_MESA_HEADERS=NO
++- BUILD_TYPE="$BUILD_TYPE MESA"
++-else
++- AC_MSG_RESULT([external])
++- SYSTEM_MESA_HEADERS=YES
++- AC_LANG_PUSH(C)
++- AC_CHECK_HEADER(GL/glxext.h, [],
++- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
++- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
++- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
++- AC_LANG_POP(C)
++-fi
++-AC_SUBST(SYSTEM_MESA_HEADERS)
++-
++-dnl ===================================================================
++ dnl Check for building neon
++ dnl ===================================================================
++ AC_MSG_CHECKING([whether to use neon])
++@@ -6330,22 +6316,45 @@ dnl ===================================================================
++ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
++ ENABLE_OPENGL=
++
++-if test "x$enable_opengl" != "xno" ; then
++- save_LDFLAGS=$LDFLAGS
++- LDFLAGS="$LDFLAGS -lm"
++- AC_MSG_RESULT([yes])
++- AC_CHECK_HEADER(GL/gl.h, [],
++- [AC_MSG_ERROR([OpenGL headers not found])], [])
++- AC_CHECK_LIB(GL, main, [],
++- [AC_MSG_ERROR(libGL not installed or functional)], [])
++- AC_CHECK_LIB(GLU, main, [],
++- [AC_MSG_ERROR(libGLU not installed or functional)], [])
++- ENABLE_OPENGL=TRUE
++- LDFLAGS=$save_LDFLAGS
+++ if test "x$enable_opengl" != "xno" ; then
+++ if test "$_os" != "WINNT"; then
+++ save_LDFLAGS=$LDFLAGS
+++ LDFLAGS="$LDFLAGS -lm"
+++ AC_MSG_RESULT([yes])
+++ AC_CHECK_LIB(GL, main, [],
+++ [AC_MSG_ERROR(libGL not installed or functional)], [])
+++ AC_CHECK_LIB(GLU, main, [],
+++ [AC_MSG_ERROR(libGLU not installed or functional)], [])
+++ ENABLE_OPENGL=TRUE
+++ LDFLAGS=$save_LDFLAGS
+++
+++ dnl ===================================================================
+++ dnl Check for system Mesa
+++ dnl ===================================================================
+++ AC_MSG_CHECKING([which Mesa headers to use])
+++ if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
+++ test "$with_system_mesa_headers" != "no"; then
+++ AC_MSG_RESULT([external])
+++ SYSTEM_MESA_HEADERS=YES
+++ AC_LANG_PUSH(C)
+++ AC_CHECK_HEADER(GL/glxext.h, [],
+++ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+++ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+++ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+++ AC_LANG_POP(C)
+++ else
+++ AC_MSG_RESULT([internal])
+++ SYSTEM_MESA_HEADERS=NO
+++ BUILD_TYPE="$BUILD_TYPE MESA"
+++ fi
+++ else
+++ AC_MSG_RESULT([not on windows])
+++ fi
++ else
++- AC_MSG_RESULT([no])
+++ AC_MSG_RESULT([no])
++ fi
++
+++AC_SUBST(SYSTEM_MESA_HEADERS)
++ AC_SUBST(ENABLE_OPENGL)
++
++ AC_MSG_CHECKING([whether to build extra presenter ui])
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old 2010-12-29 21:27:25.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2010-12-29 21:27:48.000000000 +0100
+@@ -1548,6 +1548,8 @@
+
+ transogl-more-transitions.diff
+
++fix-mesa-headers-check.diff
++
+ [ OpenGLTransitionsMesa703 ]
+
+ # very hacky build fix for Mesa-7.0.3; used on openSUSE-10.2
=== modified file 'patches/series'
--- a/patches/series 2010-12-27 14:40:59 +0000
+++ b/patches/series 2010-12-29 23:11:09 +0000
@@ -4,3 +4,4 @@
hack-no-rm-fr-of-smoketest-userconfig.diff
broffice-desktop-name.diff
do-not-switch-workspaces-of-wm.diff
+fix-mesa-headers-check.diff
=== modified file 'rules'
--- a/rules 2010-12-29 21:26:46 +0000
+++ b/rules 2010-12-29 23:11:09 +0000
@@ -539,7 +539,7 @@
BUILD_DEPS += , libgl1-mesa-dev [$(OOO_OGLTRANS_ARCHS)], libglu1-mesa-dev [$(OOO_OGLTRANS_ARCHS)]
endif
ifeq "$(ENABLE_OPENGL)" "y"
- CONFIGURE_FLAGS += --enable-opengl
+ CONFIGURE_FLAGS += --enable-opengl --with-system-mesa-headers
endif
ifneq "$(PACKAGE_SDK)" "y"
Reply to: