mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup --without-x build

Browse Source 
Accept gl linkage in hope of future offscreen mesa support.
Avoid linking with GLX though.

Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/13452
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Riccardo Magliocchetti
2014-12-22 19:10:59 +01:00
committed by Michael Stahl
parent 7ce1e0e1ec
commit b9a847b78c
14 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -10210,6 +10210,7 @@ else
fi fi
AC_SUBST(ENABLE_VLC) AC_SUBST(ENABLE_VLC)
# this is for opengl transitions in impress slideshow
ENABLE_OPENGL= ENABLE_OPENGL=
if test $_os = iOS -o $_os = Android; then if test $_os = iOS -o $_os = Android; then
: # disable : # disable
@@ -10226,7 +10227,9 @@ elif test $_os = WINNT; then
SYSTEM_MESA_HEADERS= SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA" BUILD_TYPE="$BUILD_TYPE MESA"
else else
ENABLE_OPENGL=TRUE if test "$with_x" != "no"; then
ENABLE_OPENGL=TRUE
fi
ENABLE_OPENGL_CANVAS=TRUE ENABLE_OPENGL_CANVAS=TRUE
dnl =================================================================== dnl ===================================================================

8
desktop/Library_sofficeapp.mk
View File

@@ -91,6 +91,13 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/migration/migration \ desktop/source/migration/migration \
)) ))
ifeq ($(ENABLE_HEADLESS),TRUE)
$(eval $(call gb_Library_add_libs,sofficeapp,\
-lm \
-ldl \
-lpthread \
))
else
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Library_use_static_libraries,sofficeapp,\ $(eval $(call gb_Library_use_static_libraries,sofficeapp,\
glxtest \ glxtest \
@@ -105,6 +112,7 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
-lX11 \ -lX11 \
)) ))
endif endif
endif
# LibreOfficeKit bits # LibreOfficeKit bits
ifneq ($(filter $(OS),ANDROID IOS),) ifneq ($(filter $(OS),ANDROID IOS),)

2
desktop/inc/app.hxx
View File

@@ -193,7 +193,7 @@ OUString ReplaceStringHookProc(const OUString& rStr);
} }
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS
bool fire_glxtest_process(); bool fire_glxtest_process();
#endif #endif

2
desktop/source/app/sofficemain.cxx
View File

@@ -51,7 +51,7 @@
extern "C" int DESKTOP_DLLPUBLIC soffice_main() extern "C" int DESKTOP_DLLPUBLIC soffice_main()
{ {
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
/* Run test for OpenGL support in own process to avoid crash with broken /* Run test for OpenGL support in own process to avoid crash with broken
* OpenGL drivers. Start process as early as possible. * OpenGL drivers. Start process as early as possible.
*/ */

10
include/vcl/opengl/OpenGLContext.hxx
View File

@@ -17,6 +17,7 @@
#if defined( MACOSX ) #if defined( MACOSX )
#elif defined( IOS ) #elif defined( IOS )
#elif defined( ANDROID ) #elif defined( ANDROID )
#elif defined( LIBO_HEADLESS )
#elif defined( UNX ) #elif defined( UNX )
# include <prex.h> # include <prex.h>
# include "GL/glxew.h" # include "GL/glxew.h"
@@ -42,6 +43,7 @@ class NSOpenGLView;
#endif #endif
#elif defined( IOS ) #elif defined( IOS )
#elif defined( ANDROID ) #elif defined( ANDROID )
#elif defined( LIBO_HEADLESS )
#elif defined( UNX ) #elif defined( UNX )
#include <GL/glext.h> #include <GL/glext.h>
#define GLX_GLXEXT_PROTOTYPES 1 #define GLX_GLXEXT_PROTOTYPES 1
@@ -110,6 +112,7 @@ struct GLWindow
#elif defined( MACOSX ) #elif defined( MACOSX )
#elif defined( IOS ) #elif defined( IOS )
#elif defined( ANDROID ) #elif defined( ANDROID )
#elif defined( LIBO_HEADLESS )
#elif defined( UNX ) #elif defined( UNX )
Display* dpy; Display* dpy;
int screen; int screen;
@@ -137,6 +140,7 @@ struct GLWindow
#elif defined( MACOSX ) #elif defined( MACOSX )
#elif defined( IOS ) #elif defined( IOS )
#elif defined( ANDROID ) #elif defined( ANDROID )
#elif defined( LIBO_HEADLESS )
#elif defined( UNX ) #elif defined( UNX )
dpy(NULL), dpy(NULL),
screen(0), screen(0),
@@ -176,7 +180,7 @@ public:
// these methods are for the deep platform layer, don't use them in normal code // these methods are for the deep platform layer, don't use them in normal code
// only in vcl's platform code // only in vcl's platform code
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
bool init(Display* dpy, Window win, int screen); bool init(Display* dpy, Window win, int screen);
bool init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen); bool init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen);
#elif defined( _WIN32 ) #elif defined( _WIN32 )
@@ -237,7 +241,7 @@ private:
SAL_DLLPRIVATE bool InitGLEW(); SAL_DLLPRIVATE bool InitGLEW();
SAL_DLLPRIVATE bool initWindow(); SAL_DLLPRIVATE bool initWindow();
SAL_DLLPRIVATE bool ImplInit(); SAL_DLLPRIVATE bool ImplInit();
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
SAL_DLLPRIVATE void initGLWindow(Visual* pVisual); SAL_DLLPRIVATE void initGLWindow(Visual* pVisual);
#endif #endif
@@ -255,7 +259,7 @@ private:
bool mbRequestLegacyContext; bool mbRequestLegacyContext;
bool mbUseDoubleBufferedRendering; bool mbUseDoubleBufferedRendering;
bool mbRequestVirtualDevice; bool mbRequestVirtualDevice;
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
bool mbPixmap; // is a pixmap instead of a window bool mbPixmap; // is a pixmap instead of a window
#endif #endif

4
include/vcl/opengl/OpenGLHelper.hxx
View File

@@ -16,7 +16,7 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
# include <prex.h> # include <prex.h>
# include "GL/glxew.h" # include "GL/glxew.h"
# include <postx.h> # include <postx.h>
@@ -67,7 +67,7 @@ public:
*/ */
static bool isVCLOpenGLEnabled(); static bool isVCLOpenGLEnabled();
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI); static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI);
static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool& bInverted ); static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool& bInverted );
#endif #endif

7
svx/Executable_gengal.mk
View File

@@ -61,6 +61,12 @@ $(eval $(call gb_Executable_use_system_win32_libs,gengal,\
)) ))
endif endif
ifeq ($(ENABLE_HEADLESS),TRUE)
$(eval $(call gb_Executable_add_libs,gengal,\
-ldl \
-lpthread \
))
else
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,gengal,\ $(eval $(call gb_Executable_add_libs,gengal,\
-ldl \ -ldl \
@@ -74,5 +80,6 @@ $(eval $(call gb_Executable_use_static_libraries,gengal,\
glxtest \ glxtest \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

3
sw/Module_sw.mk
View File

@@ -20,7 +20,8 @@
$(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_Module,sw))
$(eval $(call gb_Module_add_targets,sw,\ $(eval $(call gb_Module_add_targets,sw,\
$(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \ $(if $(ENABLE_HEADLESS),, \
$(call gb_Helper_optional,DESKTOP,Executable_tiledrendering)) \
CustomTarget_generated \ CustomTarget_generated \
Library_msword \ Library_msword \
Library_sw \ Library_sw \

2
sw/qa/extras/odfimport/odfimport.cxx
View File

@@ -459,7 +459,7 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
// Previously copy&paste failed to copy the table in case it was the document-starting one. // Previously copy&paste failed to copy the table in case it was the document-starting one.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
#if !defined(MACOSX) && !defined(ENABLE_HEADLESS) // FIXME #if !defined(MACOSX) && !defined(LIBO_HEADLESS) // FIXME
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
#endif #endif
} }

2
vcl/Executable_icontest.mk
View File

@@ -26,7 +26,6 @@ $(eval $(call gb_Executable_use_static_libraries,icontest,\
)) ))
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,icontest,\ $(eval $(call gb_Executable_add_libs,icontest,\
-lm \ -lm \
-ldl \ -ldl \
@@ -39,7 +38,6 @@ $(eval $(call gb_Executable_add_libs,icontest,\
$(eval $(call gb_Executable_use_static_libraries,icontest,\ $(eval $(call gb_Executable_use_static_libraries,icontest,\
glxtest \ glxtest \
)) ))
else ifeq ($(OS),WNT) else ifeq ($(OS),WNT)
$(eval $(call gb_Executable_use_system_win32_libs,icontest,\ $(eval $(call gb_Executable_use_system_win32_libs,icontest,\

18
vcl/Module_vcl.mk
View File

@@ -25,12 +25,14 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_opengl \ Package_opengl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \ StaticLibrary_vclmain \
Executable_ui-previewer \ $(if $(ENABLE_HEADLESS),, \
Executable_ui-previewer) \
$(if $(filter LINUX MACOSX WNT,$(OS)), \ $(if $(filter LINUX MACOSX WNT,$(OS)), \
Executable_icontest \
Executable_outdevgrind \ Executable_outdevgrind \
Executable_vcldemo \ $(if $(ENABLE_HEADLESS),, \
Executable_mtfdemo )) \ Executable_vcldemo \
Executable_icontest \
Executable_mtfdemo ))) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \
Executable_svdemo \ Executable_svdemo \
Executable_svptest \ Executable_svptest \
@@ -48,7 +50,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gen \ Library_vclplug_gen \
Library_desktop_detector \ Library_desktop_detector \
StaticLibrary_headless \ StaticLibrary_headless \
StaticLibrary_glxtest \ StaticLibrary_glxtest \
Package_fontunxppds \ Package_fontunxppds \
Package_fontunxpsprint \ Package_fontunxpsprint \
)) ))
@@ -107,10 +109,16 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_wmf_test \ CppunitTest_vcl_wmf_test \
)) ))
ifeq ($(GUIBASE),unx) ifeq ($(GUIBASE),unx)
$(eval $(call gb_Module_add_check_targets,vcl,\ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \ CppunitTest_vcl_timer \
)) ))
endif endif
ifeq ($(ENABLE_HEADLESS),TRUE)
$(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \
))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

26
vcl/source/opengl/OpenGLContext.cxx
View File

@@ -38,7 +38,7 @@ using namespace com::sun::star;
#define MAX_FRAMEBUFFER_COUNT 30 #define MAX_FRAMEBUFFER_COUNT 30
// TODO use rtl::Static instead of 'static' // TODO use rtl::Static instead of 'static'
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
static std::vector<GLXContext> g_vShareList; static std::vector<GLXContext> g_vShareList;
#elif defined(WNT) #elif defined(WNT)
static std::vector<HGLRC> g_vShareList; static std::vector<HGLRC> g_vShareList;
@@ -46,7 +46,7 @@ static std::vector<HGLRC> g_vShareList;
GLWindow::~GLWindow() GLWindow::~GLWindow()
{ {
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
XFree(vi); XFree(vi);
#endif #endif
} }
@@ -69,7 +69,7 @@ OpenGLContext::OpenGLContext():
mpNextContext(NULL) mpNextContext(NULL)
{ {
SAL_INFO("vcl.opengl", "new context: " << this); SAL_INFO("vcl.opengl", "new context: " << this);
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
mbPixmap = false; mbPixmap = false;
#endif #endif
@@ -450,7 +450,7 @@ debug_callback(GLenum source, GLenum type, GLuint id,
#endif #endif
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
namespace { namespace {
@@ -679,7 +679,7 @@ bool OpenGLContext::init(SystemChildWindow* pChildWindow)
return ImplInit(); return ImplInit();
} }
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
bool OpenGLContext::init(Display* dpy, Window win, int screen) bool OpenGLContext::init(Display* dpy, Window win, int screen)
{ {
if(mbInitialized) if(mbInitialized)
@@ -1125,7 +1125,7 @@ bool OpenGLContext::initWindow()
return true; return true;
} }
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
bool OpenGLContext::initWindow() bool OpenGLContext::initWindow()
{ {
@@ -1245,7 +1245,7 @@ void OpenGLContext::reset()
} }
#elif defined( MACOSX ) #elif defined( MACOSX )
OpenGLWrapper::resetCurrent(); OpenGLWrapper::resetCurrent();
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing // nothing
#elif defined( UNX ) #elif defined( UNX )
if(m_aGLWin.ctx) if(m_aGLWin.ctx)
@@ -1289,6 +1289,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool)
aWinData.nSize = sizeof(aWinData); aWinData.nSize = sizeof(aWinData);
aWinData.pVisual = NULL; aWinData.pVisual = NULL;
#if !defined(LIBO_HEADLESS)
const SystemEnvData* sysData(pParent->GetSystemData()); const SystemEnvData* sysData(pParent->GetSystemData());
Display *dpy = reinterpret_cast<Display*>(sysData->pDisplay); Display *dpy = reinterpret_cast<Display*>(sysData->pDisplay);
@@ -1316,6 +1317,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool)
SAL_INFO("vcl.opengl", "using VisualID " << vi->visualid); SAL_INFO("vcl.opengl", "using VisualID " << vi->visualid);
aWinData.pVisual = (void*)(vi->visual); aWinData.pVisual = (void*)(vi->visual);
} }
#endif
return aWinData; return aWinData;
} }
@@ -1329,7 +1331,7 @@ bool OpenGLContext::isCurrent()
wglGetCurrentDC() == m_aGLWin.hDC); wglGetCurrentDC() == m_aGLWin.hDC);
#elif defined( MACOSX ) #elif defined( MACOSX )
return false; return false;
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
return false; return false;
#elif defined( UNX ) #elif defined( UNX )
GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win; GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win;
@@ -1367,7 +1369,7 @@ void OpenGLContext::makeCurrent()
#elif defined( MACOSX ) #elif defined( MACOSX )
NSOpenGLView* pView = getOpenGLView(); NSOpenGLView* pView = getOpenGLView();
OpenGLWrapper::makeCurrent(pView); OpenGLWrapper::makeCurrent(pView);
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing // nothing
#elif defined( UNX ) #elif defined( UNX )
#ifdef DBG_UTIL #ifdef DBG_UTIL
@@ -1408,7 +1410,7 @@ void OpenGLContext::resetCurrent()
wglMakeCurrent( m_aGLWin.hDC, 0 ); wglMakeCurrent( m_aGLWin.hDC, 0 );
#elif defined( MACOSX ) #elif defined( MACOSX )
OpenGLWrapper::resetCurrent(); OpenGLWrapper::resetCurrent();
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing // nothing
#elif defined( UNX ) #elif defined( UNX )
glXMakeCurrent(m_aGLWin.dpy, None, NULL); glXMakeCurrent(m_aGLWin.dpy, None, NULL);
@@ -1422,7 +1424,7 @@ void OpenGLContext::swapBuffers()
#elif defined( MACOSX ) #elif defined( MACOSX )
NSOpenGLView* pView = getOpenGLView(); NSOpenGLView* pView = getOpenGLView();
OpenGLWrapper::swapBuffers(pView); OpenGLWrapper::swapBuffers(pView);
#elif defined( IOS ) || defined( ANDROID ) #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing // nothing
#elif defined( UNX ) #elif defined( UNX )
glXSwapBuffers(m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : m_aGLWin.win); glXSwapBuffers(m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : m_aGLWin.win);
@@ -1433,7 +1435,7 @@ void OpenGLContext::sync()
{ {
#if defined( WNT ) #if defined( WNT )
// nothing // nothing
#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) #elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing // nothing
#elif defined( UNX ) #elif defined( UNX )
glXWaitGL(); glXWaitGL();

2
vcl/source/opengl/OpenGLHelper.cxx
View File

@@ -480,7 +480,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
return bEnable; return bEnable;
} }
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
bool OpenGLHelper::GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI) bool OpenGLHelper::GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI)
{ {

4
vcl/source/salmain/salmain.cxx
View File

@@ -28,12 +28,12 @@
#include "salinst.hxx" #include "salinst.hxx"
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS
#include <vcl/opengl/glxtest.hxx> #include <vcl/opengl/glxtest.hxx>
#endif #endif
SAL_IMPLEMENT_MAIN() { SAL_IMPLEMENT_MAIN() {
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS
fire_glxtest_process(); fire_glxtest_process();
#endif #endif
tools::extendApplicationEnvironment(); tools::extendApplicationEnvironment();