------------------------------------------------------------ revno: 2326 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Fri 2011-01-14 01:32:38 +0100 message: we still need fix-mesa-headers-check.diff; rc3-2 added: patches/fix-mesa-headers-check.diff modified: changelog patches/series
=== modified file 'changelog' --- a/changelog 2011-01-13 19:40:43 +0000 +++ b/changelog 2011-01-14 00:32:38 +0000 @@ -1,3 +1,10 @@ +libreoffice (1:3.3.0~rc3-2) experimental; urgency=low + + * debian/patches/fix-mesa-headers-check.diff: readd, still needed; + forgot to actually push this upstream + + -- Rene Engelhard <r...@debian.org> Thu, 13 Jan 2011 22:45:04 +0100 + libreoffice (1:3.3.0~rc3-1) experimental; urgency=low * LibreOffice 3.3.0 rc3
=== 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 2011-01-14 00:32:38 +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 2011-01-12 01:48:45 +0000 +++ b/patches/series 2011-01-14 00:32:38 +0000 @@ -3,6 +3,7 @@ buildfix-patches.diff hack-no-rm-fr-of-smoketest-userconfig.diff do-not-switch-workspaces-of-wm.diff +fix-mesa-headers-check.diff fix-wrapper-manpage-install.diff java-common-message-LibreOffice.diff fix-hr-and-te-translations.diff
