Module Name: src
Committed By: jmcneill
Date: Thu Jan 20 18:36:46 UTC 2011
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/libchromeXvMCPro: Makefile shlib_version
Log Message:
build and install libchromeXvMCPro from xf86-video-openchrome
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libchromeXvMCPro/Makefile \
src/external/mit/xorg/lib/libchromeXvMCPro/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.8 src/distrib/sets/lists/xbase/md.amd64:1.9
--- src/distrib/sets/lists/xbase/md.amd64:1.8 Wed Jan 19 00:36:40 2011
+++ src/distrib/sets/lists/xbase/md.amd64 Thu Jan 20 18:36:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.8 2011/01/19 00:36:40 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.9 2011/01/20 18:36:46 jmcneill Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg
@@ -9,6 +9,9 @@
./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/libchromeXvMCPro.so -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro.so.1.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.24 src/distrib/sets/lists/xbase/md.i386:1.25
--- src/distrib/sets/lists/xbase/md.i386:1.24 Wed Jan 19 00:36:40 2011
+++ src/distrib/sets/lists/xbase/md.i386 Thu Jan 20 18:36:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.24 2011/01/19 00:36:40 jmcneill Exp $
+# $NetBSD: md.i386,v 1.25 2011/01/20 18:36:46 jmcneill Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg
@@ -9,6 +9,9 @@
./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/libchromeXvMCPro.so -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro.so.1.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.29 src/distrib/sets/lists/xcomp/md.amd64:1.30
--- src/distrib/sets/lists/xcomp/md.amd64:1.29 Wed Jan 19 01:52:43 2011
+++ src/distrib/sets/lists/xcomp/md.amd64 Thu Jan 20 18:36:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.29 2011/01/19 01:52:43 jakllsch Exp $
+# $NetBSD: md.amd64,v 1.30 2011/01/20 18:36:46 jmcneill Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -83,6 +83,10 @@
./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/libchromeXvMCPro.a -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libchromeXvMCPro_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libchromeXvMCPro_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
@@ -110,6 +114,7 @@
./usr/libdata/debug/usr/X11R7/lib/libI810XvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.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/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.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
@@ -189,4 +194,5 @@
./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lchromeXvMCPro.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.36 src/distrib/sets/lists/xcomp/md.i386:1.37
--- src/distrib/sets/lists/xcomp/md.i386:1.36 Wed Jan 19 01:52:43 2011
+++ src/distrib/sets/lists/xcomp/md.i386 Thu Jan 20 18:36:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.36 2011/01/19 01:52:43 jakllsch Exp $
+# $NetBSD: md.i386,v 1.37 2011/01/20 18:36:46 jmcneill Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -83,6 +83,10 @@
./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/libchromeXvMCPro.a -unknown- xorg
+./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libchromeXvMCPro_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libchromeXvMCPro_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
@@ -107,6 +111,7 @@
./usr/libdata/debug/usr/X11R7/lib/libI810XvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.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/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.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
@@ -188,4 +193,5 @@
./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.22 src/external/mit/xorg/lib/Makefile:1.23
--- src/external/mit/xorg/lib/Makefile:1.22 Wed Jan 19 16:32:12 2011
+++ src/external/mit/xorg/lib/Makefile Thu Jan 20 18:36:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/01/19 16:32:12 jmcneill Exp $
+# $NetBSD: Makefile,v 1.23 2011/01/20 18:36:45 jmcneill Exp $
# build libraries for xorg
@@ -25,6 +25,7 @@
SUBDIR+=libI810XvMC
SUBDIR+=libIntelXvMC
SUBDIR+=libchromeXvMC
+SUBDIR+=libchromeXvMCPro
.endif
SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
libXrandr \
Added files:
Index: src/external/mit/xorg/lib/libchromeXvMCPro/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libchromeXvMCPro/Makefile:1.1
--- /dev/null Thu Jan 20 18:36:46 2011
+++ src/external/mit/xorg/lib/libchromeXvMCPro/Makefile Thu Jan 20 18:36:46 2011
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2011/01/20 18:36:46 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+LIB= chromeXvMCPro
+.PATH: ${X11SRCDIR.xf86-video-openchrome}/libxvmc
+.PATH: ${X11SRCDIR.xf86-video-openchrome}/src
+
+SRCS= viaLowLevelPro.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 \
+ Xv ${.CURDIR}/../libXv \
+ XvMC ${.CURDIR}/../libXvMC \
+ drm ${.CURDIR}/../libdrm
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libchromeXvMCPro/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libchromeXvMCPro/shlib_version:1.1
--- /dev/null Thu Jan 20 18:36:46 2011
+++ src/external/mit/xorg/lib/libchromeXvMCPro/shlib_version Thu Jan 20 18:36:46 2011
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/20 18:36:46 jmcneill Exp $
+#
+major=1
+minor=0
