Module Name: src
Committed By: jmcneill
Date: Wed Jan 19 16:31:24 UTC 2011
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
Added Files:
src/external/mit/xorg/lib/libXvMCW: Makefile shlib_version
Log Message:
Build and install the XvMC wrapper library libXvMCW.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXvMCW/Makefile \
src/external/mit/xorg/lib/libXvMCW/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/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.40 src/distrib/sets/lists/xbase/shl.mi:1.41
--- src/distrib/sets/lists/xbase/shl.mi:1.40 Mon Nov 22 08:54:14 2010
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jan 19 16:31:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.40 2010/11/22 08:54:14 mrg Exp $
+# $NetBSD: shl.mi,v 1.41 2011/01/19 16:31:23 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -285,6 +285,9 @@
./usr/X11R7/lib/libXvMC.so -unknown- xorg
./usr/X11R7/lib/libXvMC.so.2 -unknown- xorg
./usr/X11R7/lib/libXvMC.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXvMCW.so -unknown- xorg
+./usr/X11R7/lib/libXvMCW.so.1 -unknown- xorg
+./usr/X11R7/lib/libXvMCW.so.1.0 -unknown- xorg
./usr/X11R7/lib/libXxf86dga.so -unknown- xorg
./usr/X11R7/lib/libXxf86dga.so.2 -unknown- xorg
./usr/X11R7/lib/libXxf86dga.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.120 src/distrib/sets/lists/xcomp/mi:1.121
--- src/distrib/sets/lists/xcomp/mi:1.120 Sat Nov 27 22:21:27 2010
+++ src/distrib/sets/lists/xcomp/mi Wed Jan 19 16:31:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.120 2010/11/27 22:21:27 mrg Exp $
+# $NetBSD: mi,v 1.121 2011/01/19 16:31:23 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6248,6 +6248,9 @@
./usr/X11R7/lib/libXvMC.a -unknown- xorg
./usr/X11R7/lib/libXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXvMC_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXvMCW.a -unknown- xorg
+./usr/X11R7/lib/libXvMCW_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libXvMCW_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXv_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXv_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXxf86dga.a -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.26 src/distrib/sets/lists/xcomp/shl.mi:1.27
--- src/distrib/sets/lists/xcomp/shl.mi:1.26 Thu Nov 25 16:32:39 2010
+++ src/distrib/sets/lists/xcomp/shl.mi Wed Jan 19 16:31:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.26 2010/11/25 16:32:39 njoly Exp $
+# $NetBSD: shl.mi,v 1.27 2011/01/19 16:31:23 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -85,6 +85,7 @@
./usr/X11R7/lib/libXt_pic.a -unknown- xorg
./usr/X11R7/lib/libXtst_pic.a -unknown- xorg
./usr/X11R7/lib/libXvMC_pic.a -unknown- xorg
+./usr/X11R7/lib/libXvMCW_pic.a -unknown- xorg
./usr/X11R7/lib/libXv_pic.a -unknown- xorg
./usr/X11R7/lib/libXxf86dga_pic.a -unknown- xorg
./usr/X11R7/lib/libXxf86misc_pic.a -unknown- xorg
@@ -222,6 +223,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug
Added files:
Index: src/external/mit/xorg/lib/libXvMCW/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libXvMCW/Makefile:1.1
--- /dev/null Wed Jan 19 16:31:24 2011
+++ src/external/mit/xorg/lib/libXvMCW/Makefile Wed Jan 19 16:31:24 2011
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2011/01/19 16:31:24 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+LIB= XvMCW
+.PATH: ${X11SRCDIR.XvMC}/src
+
+SRCS= XvMCWrapper.c
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= -DXVMC_CONFIGDIR=${X11ETCDIR}
+CPPFLAGS+= -DXVMC_SOVERSION=\".2.0\"
+CPPFLAGS+= -DXVMC_CLIENTSOVERSION=\".1.0\"
+CPPFLAGS+= -DXV_SOVERSION=\".2.0\"
+
+LIBDPLIBS= Xext ${.CURDIR}/../libXext \
+ X11 ${.CURDIR}/../libX11/dynamic
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libXvMCW/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libXvMCW/shlib_version:1.1
--- /dev/null Wed Jan 19 16:31:24 2011
+++ src/external/mit/xorg/lib/libXvMCW/shlib_version Wed Jan 19 16:31:24 2011
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/19 16:31:24 jmcneill Exp $
+#
+major=1
+minor=0
