Module Name: src
Committed By: mrg
Date: Mon Jul 20 02:07:36 UTC 2015
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
Log Message:
use xorg-pkg-ver.mk for silicon-motion.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/xorg-pkg-ver.mk
diff -u src/external/mit/xorg/xorg-pkg-ver.mk:1.1 src/external/mit/xorg/xorg-pkg-ver.mk:1.2
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.1 Sun Jul 19 19:49:17 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 02:07:36 2015
@@ -1,16 +1,18 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.1 2015/07/19 19:49:17 mrg Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.2 2015/07/20 02:07:36 mrg Exp $
# when including this make sure PROG is set so that $X11SRCDIR.$PROG
-# is a valid setting.
+# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
-.if exists(${X11SRCDIR.${PROG}}/configure)
+XORG_PKG_VER_PROG?= ${PROG}
+
+.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
XORG_PKG_PACKAGE_VERSION!= \
awk -F= '/^PACKAGE_VERSION=/ { \
match($$2, "([0-9]+\\.)+[0-9]+"); \
version = substr($$2, RSTART, RLENGTH); \
print version; \
exit 0; \
- }' ${X11SRCDIR.${PROG}}/configure
+ }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_VERSION)
CPPFLAGS+= -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
.endif
@@ -21,7 +23,7 @@ XORG_PKG_PACKAGE_STRING!= \
string = substr($$2, RSTART, RLENGTH); \
print string; \
exit 0; \
- }' ${X11SRCDIR.${PROG}}/configure
+ }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_STRING)
CPPFLAGS+= -DPACKAGE_STRING=\"${XORG_PKG_PACKAGE_STRING:Q}\"
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.6 Mon Jun 3 09:12:28 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Mon Jul 20 02:07:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/03 09:12:28 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -10,6 +10,9 @@ SRCS+= smilynx_output.c smilynx_hw.c sm
SRCS+= smi501_crtc.c smi501_output.c
MAN= siliconmotion.4
-CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
.include "../Makefile.xf86-driver"
+
+XORG_PKG_VER_PROG= ${DRIVER}
+.include "../../../xorg-pkg-ver.mk"
