Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libGL Expand all @@ things in pkgconfi...



details:   https://anonhg.NetBSD.org/src/rev/d21d4d01a13e
branches:  trunk
changeset: 450291:d21d4d01a13e
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Apr 09 14:31:06 2019 +0000

description:
Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.

diffstat:

 external/mit/xorg/lib/libGL/Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 93e33b1e6fb4 -r d21d4d01a13e external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Tue Apr 09 13:53:52 2019 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Tue Apr 09 14:31:06 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2019/03/10 10:51:58 mrg Exp $
+#      $NetBSD: Makefile,v 1.24 2019/04/09 14:31:06 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -203,11 +203,11 @@
 # XXX remove these from bsd.x11.mk
 # XXX enable GLX TLS?  it's enabled in the code, but not here..
 PKGCONFIG_SED_FLAGS= \
-       -e "s,@GL_PC_REQ_PRIV@,x11 xext,; \
-           s,@GL_LIB@,GL,; \
-           s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+       -e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \
+           s,@GL_PKGCONF_LIB@,GL,; \
+           s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \
            s,@GL_PC_CFLAGS@,,; \
-           s,@GLX_TLS@,no,"
+           s,@GLX_TLS@,yes,"
 
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare -Wno-format -Wno-constant-conversion \



Home | Main Index | Thread Index | Old Index