Date: Sat, 8 Jun 2002 17:12:47 -0700 (PDT) From: Eric Anholt <eanholt@gladstone.uoregon.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39050: fix DRI for wine use Message-ID: <200206090012.g590ClaB048664@anholt.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 39050
>Category: ports
>Synopsis: fix DRI for wine use
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 08 17:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Eric Anholt
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD anholt.dyndns.org 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Thu May 23 12:38:28 PDT 2002 anholt@anholt.dyndns.org:/usr/src/current/sys/i386/compile/MYKERNEL i386
>Description:
Without this, running wine with the DRI results in SW rendering because:
libGL error: dlopen failed: /usr/X11R6/lib/modules/dri/radeon_dri.so: Undefined symbol "XSync"
Adding -lX11 (XONLYLIB) to the Makefile allowed the symbol to be found.
The strange part is that this code works on linux. wine is -lGL -lX11.
libGL dlopens radeon_dri.so (RTLD_GLOBAL|RTLD_NOW), and radeon_dri.so
references libX11 functions but is not linked -lX11 itself. Should the
functions be found?
Because I don't understand what's the correct behavior, I just consider this
a workaround.
>How-To-Repeat:
>Fix:
Add to XFree86-4-libraries/files and recompile/install XFree86-4-Server
--- patch-drilx11 begins here ---
--- lib/GL/mesa/src/drv/ffb/Imakefile.orig Sat Jun 8 16:02:28 2002
+++ lib/GL/mesa/src/drv/ffb/Imakefile Sat Jun 8 16:02:29 2002
@@ -38,7 +38,7 @@
SRCS = $(FFBSRCS)
OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/gamma/Imakefile.orig Sat Jun 8 16:01:51 2002
+++ lib/GL/mesa/src/drv/gamma/Imakefile Sat Jun 8 16:01:53 2002
@@ -46,7 +46,7 @@
OBJS = $(LOWOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(GAMMAOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/i810/Imakefile.orig Sat Jun 8 16:00:38 2002
+++ lib/GL/mesa/src/drv/i810/Imakefile Sat Jun 8 16:01:32 2002
@@ -46,7 +46,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/i830/Imakefile.orig Sat Jun 8 16:00:43 2002
+++ lib/GL/mesa/src/drv/i830/Imakefile Sat Jun 8 16:01:31 2002
@@ -46,7 +46,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/mga/Imakefile.orig Sat Jun 8 16:00:31 2002
+++ lib/GL/mesa/src/drv/mga/Imakefile Sat Jun 8 16:01:29 2002
@@ -47,7 +47,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/r128/Imakefile.orig Sat Jun 8 16:00:24 2002
+++ lib/GL/mesa/src/drv/r128/Imakefile Sat Jun 8 16:01:34 2002
@@ -47,7 +47,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/radeon/Imakefile.orig Sat Jun 8 15:59:52 2002
+++ lib/GL/mesa/src/drv/radeon/Imakefile Sat Jun 8 15:59:54 2002
@@ -47,7 +47,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/sis/Imakefile.orig Sat Jun 8 16:02:40 2002
+++ lib/GL/mesa/src/drv/sis/Imakefile Sat Jun 8 16:02:45 2002
@@ -53,7 +53,7 @@
OBJS = $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(SISOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- lib/GL/mesa/src/drv/tdfx/Imakefile.orig Sat Jun 8 16:00:17 2002
+++ lib/GL/mesa/src/drv/tdfx/Imakefile Sat Jun 8 16:01:12 2002
@@ -47,7 +47,7 @@
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
#include <Library.tmpl>
--- patch-drilx11 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206090012.g590ClaB048664>