glx: drop GLX_LIBS from X server and workaround sdksyms.
We've had reports of two copies of the GLX bits, one in the server and one in libglx.so causing problems, I didn't understand why the X server needed a copy so drop it, however then we have to fix a missing GlxExtensionInit that comes from sdksyms, so work around it by moving that one declaration into a header that sdksyms doesn't scan. Thanks to Jon Turney for debugging the actual problem. (copyright header from extinit.h that seems most appropriate put on top). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52402 Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
afa53fe7cf
commit
aad428b8e2
|
@ -1600,7 +1600,7 @@ if test "x$XORG" = xyes; then
|
|||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
|
||||
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
|
||||
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
|
||||
XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
|
||||
XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
|
||||
|
||||
dnl ==================================================================
|
||||
dnl symbol visibility
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include "privates.h"
|
||||
#include <os.h>
|
||||
#include "extinit.h"
|
||||
#include "glx_extinit.h"
|
||||
#include "unpack.h"
|
||||
#include "glxutil.h"
|
||||
#include "glxext.h"
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "micmap.h"
|
||||
#include "glxswap.h"
|
||||
#include "extinit.h"
|
||||
#include "glx_extinit.h"
|
||||
|
||||
/*
|
||||
** Forward declarations.
|
||||
|
|
|
@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "globals.h"
|
||||
#include "glxserver.h"
|
||||
#include "extinit.h"
|
||||
#include "glx_extinit.h"
|
||||
|
||||
static MODULESETUPPROTO(glxSetup);
|
||||
|
||||
|
|
|
@ -55,6 +55,7 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
|
|||
DWORD dwFlags, LPTSTR pszPath);
|
||||
#endif
|
||||
|
||||
#include "glx_extinit.h"
|
||||
/*
|
||||
* References to external symbols
|
||||
*/
|
||||
|
|
|
@ -83,7 +83,6 @@ extern void GEExtensionInit(void);
|
|||
|
||||
#ifdef GLXEXT
|
||||
extern _X_EXPORT Bool noGlxExtension;
|
||||
extern void GlxExtensionInit(void);
|
||||
#endif
|
||||
|
||||
#ifdef PANORAMIX
|
||||
|
|
34
include/glx_extinit.h
Normal file
34
include/glx_extinit.h
Normal file
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
||||
* so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
|
||||
* NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of the XFree86 Project shall not
|
||||
* be used in advertising or otherwise to promote the sale, use or other dealings
|
||||
* in this Software without prior written authorization from the XFree86 Project.
|
||||
*/
|
||||
|
||||
#ifndef GLX_EXT_INIT_H
|
||||
#define GLX_EXT_INIT_H
|
||||
|
||||
/* this is separate due to sdksyms pulling in extinit.h */
|
||||
#ifdef GLXEXT
|
||||
extern void GlxExtensionInit(void);
|
||||
#endif
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user