Module Name:    src
Committed By:   msaitoh
Date:           Mon Dec 12 10:01:17 UTC 2016

Added Files:
        src/external/mit/xorg/lib/libdrm_nouveau [netbsd-7]: Makefile
            shlib_version
        src/external/mit/xorg/server/drivers/xf86-video-nouveau [netbsd-7]:
            Makefile

Log Message:
Add three miissing files for ticket #1305 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/xorg/lib/libdrm_nouveau/Makefile \
    src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
cvs rdiff -u -r0 -r1.6.2.2 \
    src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/mit/xorg/lib/libdrm_nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,25 @@
+#      $NetBSD: Makefile,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+.include <bsd.own.mk>
+
+LIB=	drm_nouveau
+.PATH: ${X11SRCDIR.drm}
+.PATH: ${X11SRCDIR.drm}/nouveau
+
+SRCS=	nouveau.c \
+	pushbuf.c \
+	bufctx.c \
+	abi16.c
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
+
+LIBDPLIBS=	drm	${.CURDIR}/../libdrm
+
+PKGCONFIG=	libdrm_nouveau
+PKGDIST=	drm
+
+.include "../libdrm/Makefile.defines"
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/shlib_version	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+#
+major=2
+minor=0

Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,51 @@
+#	$NetBSD: Makefile,v 1.6.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+DRIVER=		xf86-video-nouveau
+DRIVER_NAME=	nouveau_drv
+
+SRCS=		nouveau_copy.c \
+		nouveau_copy85b5.c \
+		nouveau_copy90b5.c \
+		nouveau_copya0b5.c \
+		nouveau_exa.c \
+		nouveau_xv.c \
+		nouveau_dri2.c \
+		nouveau_present.c \
+		nouveau_sync.c \
+		nouveau_wfb.c \
+		nv_accel_common.c \
+		nv_driver.c \
+		nv_shadow.c \
+		nv04_exa.c \
+		nv04_xv_ovl.c \
+		nv04_xv_blit.c \
+		nv10_exa.c \
+		nv10_xv_ovl.c \
+		nv30_exa.c \
+		nv30_xv_tex.c \
+		nv40_exa.c \
+		nv40_xv_tex.c \
+		nv50_accel.c \
+		nv50_exa.c \
+		nv50_xv.c \
+		nvc0_accel.c \
+		nvc0_exa.c \
+		nvc0_xv.c \
+		drmmode_display.c \
+		vl_hwmc.c
+
+LIBDPLIBS+=	drm_nouveau ${.CURDIR}/../../../lib/libdrm_nouveau
+
+MAN=		nouveau.4
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+
+CPPFLAGS+=	-DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
+CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_MINOR}
+CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
+CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
+
+.include "../Makefile.xf86-driver"
+
+# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
+DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog

Reply via email to