Module Name: src
Committed By: mrg
Date: Fri May 28 06:26:55 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.i386
src/distrib/sets/lists/xcomp: md.amd64 md.i386
src/external/mit/xorg/lib: Makefile
Added Files:
src/external/mit/xorg/lib/libchromeXvMC: Makefile shlib_version
Log Message:
build libchromeXvMC on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libchromeXvMC/Makefile \
src/external/mit/xorg/lib/libchromeXvMC/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.5 src/distrib/sets/lists/xbase/md.amd64:1.6
--- src/distrib/sets/lists/xbase/md.amd64:1.5 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/md.amd64 Fri May 28 06:26:55 2010
@@ -1,5 +1,8 @@
-# $NetBSD: md.amd64,v 1.5 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.amd64,v 1.6 2010/05/28 06:26:55 mrg Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
+./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC.so.0.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.21 src/distrib/sets/lists/xbase/md.i386:1.22
--- src/distrib/sets/lists/xbase/md.i386:1.21 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/md.i386 Fri May 28 06:26:55 2010
@@ -1,5 +1,8 @@
-# $NetBSD: md.i386,v 1.21 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.i386,v 1.22 2010/05/28 06:26:55 mrg Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
+./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC.so.0.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.26 src/distrib/sets/lists/xcomp/md.amd64:1.27
--- src/distrib/sets/lists/xcomp/md.amd64:1.26 Sun May 23 21:32:50 2010
+++ src/distrib/sets/lists/xcomp/md.amd64 Fri May 28 06:26:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.26 2010/05/23 21:32:50 mrg Exp $
+# $NetBSD: md.amd64,v 1.27 2010/05/28 06:26:55 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -71,6 +71,10 @@
./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 -unknown- .man,x11
./usr/X11R6/man/man4/fpit.4 -unknown- .man,x11
./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete
+./usr/X11R7/lib/libchromeXvMC.a -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
@@ -96,6 +100,7 @@
./usr/libdata/debug/usr/X11R7/bin/scanpci.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/bin/xorgconfig.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi810_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi965_dri.so.0.debug -unknown- xorg,debug
@@ -170,4 +175,5 @@
./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- xorg,debug
+./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.32 src/distrib/sets/lists/xcomp/md.i386:1.33
--- src/distrib/sets/lists/xcomp/md.i386:1.32 Sun May 23 21:32:50 2010
+++ src/distrib/sets/lists/xcomp/md.i386 Fri May 28 06:26:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.32 2010/05/23 21:32:50 mrg Exp $
+# $NetBSD: md.i386,v 1.33 2010/05/28 06:26:55 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -71,6 +71,10 @@
./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 -unknown- .man,x11
./usr/X11R6/man/man4/fpit.4 -unknown- .man,x11
./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete
+./usr/X11R7/lib/libchromeXvMC.a -unknown- xorg
+./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
@@ -167,5 +171,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- xorg,debug
+./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.17 src/external/mit/xorg/lib/Makefile:1.18
--- src/external/mit/xorg/lib/Makefile:1.17 Sat May 22 22:48:18 2010
+++ src/external/mit/xorg/lib/Makefile Fri May 28 06:26:55 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2010/05/22 22:48:18 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2010/05/28 06:26:55 mrg Exp $
# build libraries for xorg
SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \
libXau libXdmcp libdrm libpciaccess
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel
+SUBDIR+=libdrm_intel libchromeXvMC
.endif
SUBDIR+=libdrm_radeon
SUBDIR+=pixman xkeyboard-config \
Added files:
Index: src/external/mit/xorg/lib/libchromeXvMC/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libchromeXvMC/Makefile:1.1
--- /dev/null Fri May 28 06:26:55 2010
+++ src/external/mit/xorg/lib/libchromeXvMC/Makefile Fri May 28 06:26:55 2010
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2010/05/28 06:26:55 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= chromeXvMC
+.PATH: ${X11SRCDIR.xf86-video-openchrome}/libxvmc
+.PATH: ${X11SRCDIR.xf86-video-openchrome}/src
+
+SRCS= viaLowLevel.c \
+ driDrawable.c \
+ viaXvMC.c \
+ xf86dri.c
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB} \
+ -DHAVE_XEXTPROTO_71 \
+ -DXSERVER_LIBPCIACCESS \
+ -DTRUE=1 -DFALSE=0
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xf86-video-openchrome}/src
+
+#LIBDPLIBS= Xext ${.CURDIR}/../libXext
+# X11 ${.CURDIR}/../libX11/dynamic
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libchromeXvMC/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libchromeXvMC/shlib_version:1.1
--- /dev/null Fri May 28 06:26:55 2010
+++ src/external/mit/xorg/lib/libchromeXvMC/shlib_version Fri May 28 06:26:55 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/05/28 06:26:55 mrg Exp $
+#
+major=0
+minor=0
