[PATCH xserver] dmx: fix linking

[Mihail Konev]

On Fri, Feb 03, 2017 at 10:08:03AM +0900, Michel Dänzer wrote:
> On 03/02/17 06:57 AM, Mihail Konev wrote:
> > Regressed-in: bb9128fd ("present: disable page flip")
> > Signed-off-by: Mihail Konev <k.mvc at ya.ru>
> > ---
> > Maybe there should be #ifdef-s instead - I only bisected :)
> > 
> >  randr/Makefile.am | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/randr/Makefile.am b/randr/Makefile.am
> > index 90dc9ec9aac4..90aa1289f958 100644
> > --- a/randr/Makefile.am
> > +++ b/randr/Makefile.am
> > @@ -30,3 +30,4 @@ if XINERAMA
> >  librandr_la_SOURCES += ${XINERAMA_SRCS}
> >  endif
> >  
> > +librandr_la_LIBADD = $(top_builddir)/render/librender.la
> > 
> 
> This looks weird. bb9128fd added a RRHasScanoutPixmap call in present
> code; I'd expect that to require linking randr to wherever the present
> code ends up, not sure why it would require linking render to randr.
> 
> Anyway, https://patchwork.freedesktop.org/patch/136239/ and
> https://patchwork.freedesktop.org/patch/136238/ basically undo bb9128fd,
> can you test that the DMX failure is fixed with those?
> 

No failure with them on top of bb9128fdc86decd6f6e3b0e145011a8c08b1d2b5

Was:

../../randr/.libs/librandr.a(rrcrtc.o): In function `ProcRRSetCrtcTransform':
/xserver/randr/rrcrtc.c:1655: undefined reference to `PictTransform_from_xRenderTransform'
../../randr/.libs/librandr.a(rrcrtc.o): In function `transform_encode':
/xserver/randr/rrcrtc.c:1718: undefined reference to `xRenderTransform_from_PictTransform'
/xserver/randr/rrcrtc.c:1718: undefined reference to `xRenderTransform_from_PictTransform'
collect2: error: ld returned 1 exit status
Makefile:760: recipe for target 'Xdmx' failed

Corrected fix that does not link into, but with:

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index eef84cb66a76..38d6ac409e76 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -80,7 +80,8 @@ XDMX_LIBS = \
 
 Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)
-Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) \
+             $(top_builddir)/render/librender.la
 
 relink:
 	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)

> 
> -- 
> Earthling Michel Dänzer               |               http://www.amd.com
> Libre software enthusiast             |             Mesa and X developer