Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Build and install Mesa GBM buffer management library (libgbm).
details: https://anonhg.NetBSD.org/src/rev/76cf1dddcadf
branches: trunk
changeset: 806407:76cf1dddcadf
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Mon Feb 23 00:09:30 2015 +0000
description:
Build and install Mesa GBM buffer management library (libgbm).
diffstat:
distrib/sets/lists/xbase/shl.mi | 5 ++-
distrib/sets/lists/xcomp/mi | 3 +-
external/mit/xorg/lib/Makefile | 3 +-
external/mit/xorg/lib/libgbm/Makefile | 48 ++++++++++++++++++++++++++++++
external/mit/xorg/lib/libgbm/shlib_version | 4 ++
share/mk/bsd.x11.mk | 4 +-
6 files changed, 63 insertions(+), 4 deletions(-)
diffs (131 lines):
diff -r f39b88a22e6d -r 76cf1dddcadf distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Sun Feb 22 17:38:19 2015 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Mon Feb 23 00:09:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.58 2015/01/29 22:58:20 nat Exp $
+# $NetBSD: shl.mi,v 1.59 2015/02/23 00:09:30 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -324,6 +324,9 @@
./usr/X11R7/lib/libfreetype.so -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
+./usr/X11R7/lib/libgbm.so -unknown- xorg
+./usr/X11R7/lib/libgbm.so.1 -unknown- xorg
+./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg
./usr/X11R7/lib/libglut.so -unknown- xorg
./usr/X11R7/lib/libglut.so.4 -unknown- xorg
./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg
diff -r f39b88a22e6d -r 76cf1dddcadf distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Sun Feb 22 17:38:19 2015 +0000
+++ b/distrib/sets/lists/xcomp/mi Mon Feb 23 00:09:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2015/02/21 17:17:16 jmcneill Exp $
+# $NetBSD: mi,v 1.159 2015/02/23 00:09:30 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5790,6 +5790,7 @@
./usr/X11R7/include/freetype2/tttags.h -unknown- xorg
./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg
./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete
+./usr/X11R7/include/gbm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
diff -r f39b88a22e6d -r 76cf1dddcadf external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Sun Feb 22 17:38:19 2015 +0000
+++ b/external/mit/xorg/lib/Makefile Mon Feb 23 00:09:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/01/07 20:42:01 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2015/02/23 00:09:30 jmcneill Exp $
# build libraries for xorg
@@ -34,6 +34,7 @@
.WAIT \
libXdmGreet \
xcb-util
+SUBDIR+=libgbm
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
diff -r f39b88a22e6d -r 76cf1dddcadf external/mit/xorg/lib/libgbm/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libgbm/Makefile Mon Feb 23 00:09:30 2015 +0000
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2015/02/23 00:09:30 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+LIB= gbm
+
+.PATH: ${X11SRCDIR.MesaLib}/src/gbm/main
+SRCS.main= \
+ backend.c \
+ gbm.c
+
+.PATH: ${X11SRCDIR.MesaLib}/src/gbm/backends/dri
+SRCS.dri= \
+ gbm_dri.c
+
+SRCS= ${SRCS.main} ${SRCS.dri}
+
+CPPFLAGS+= -D_OS_UNIX=1
+CPPFLAGS+= -DHAVE_PTHREAD=1
+CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\"
+CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/gbm\"
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/loader
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/gbm/main
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CFLAGS+= -fno-strict-aliasing -fexceptions
+
+COPTS.gbm_dri.c+= -Wno-error
+
+.include "../libloader.mk"
+
+.PATH: ${X11SRCDIR.MesaLib}/src/gbm/main
+INCS= gbm.h
+INCSDIR= ${X11INCDIR}
+
+LIBDPLIBS= glapi ${.CURDIR}/../libglapi
+LIBDPLIBS= drm ${.CURDIR}/../libdrm
+
+PKGCONFIG= gbm
+PKGDIST.gbm= ${X11SRCDIR.MesaLib}/src/gbm/main
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.gbm= ${MESA_VER}
+
+.include "../libdrm/Makefile.defines"
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r f39b88a22e6d -r 76cf1dddcadf external/mit/xorg/lib/libgbm/shlib_version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libgbm/shlib_version Mon Feb 23 00:09:30 2015 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2015/02/23 00:09:30 jmcneill Exp $
+#
+major=1
+minor=0
diff -r f39b88a22e6d -r 76cf1dddcadf share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Sun Feb 22 17:38:19 2015 +0000
+++ b/share/mk/bsd.x11.mk Mon Feb 23 00:09:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.114 2014/12/30 22:07:21 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.115 2015/02/23 00:09:30 jmcneill Exp $
.include <bsd.init.mk>
@@ -339,6 +339,8 @@
s,@DRI_DRIVER_DIR@,\\$$\{libdir\}/modules/dri,; \
s,@DRI_PC_REQ_PRIV@,,; \
s,@GLW_LIB@,GLw,; \
+ s,@GBM_PC_REQ_PRIV@,,; \
+ s,@GBM_PC_LIB_PRIV@,,; \
s,@abi_ansic@,0.4,; \
s,@abi_videodrv@,5.0,; \
s,@abi_xinput@,4.0,; \
Home |
Main Index |
Thread Index |
Old Index