Module Name: src
Committed By: jmcneill
Date: Tue Jan 18 23:33:52 UTC 2011
Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.i386
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Added Files:
src/external/mit/xorg/lib/libI810XvMC: Makefile shlib_version
src/external/mit/xorg/lib/libIntelXvMC: Makefile shlib_version
Log Message:
Enable XvMC support for Intel graphics chips
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libI810XvMC/Makefile \
src/external/mit/xorg/lib/libI810XvMC/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libIntelXvMC/Makefile \
src/external/mit/xorg/lib/libIntelXvMC/shlib_version
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
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.6 src/distrib/sets/lists/xbase/md.amd64:1.7
--- src/distrib/sets/lists/xbase/md.amd64:1.6 Fri May 28 06:26:55 2010
+++ src/distrib/sets/lists/xbase/md.amd64 Tue Jan 18 23:33:50 2011
@@ -1,5 +1,11 @@
-# $NetBSD: md.amd64,v 1.6 2010/05/28 06:26:55 mrg Exp $
+# $NetBSD: md.amd64,v 1.7 2011/01/18 23:33:50 jmcneill Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
+./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
+./usr/X11R7/lib/libI810XvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libI810XvMC.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so.0.0 -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so.0 -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so.0.0 -unknown- xorg
Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.22 src/distrib/sets/lists/xbase/md.i386:1.23
--- src/distrib/sets/lists/xbase/md.i386:1.22 Fri May 28 06:26:55 2010
+++ src/distrib/sets/lists/xbase/md.i386 Tue Jan 18 23:33:50 2011
@@ -1,5 +1,11 @@
-# $NetBSD: md.i386,v 1.22 2010/05/28 06:26:55 mrg Exp $
+# $NetBSD: md.i386,v 1.23 2011/01/18 23:33:50 jmcneill Exp $
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
+./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
+./usr/X11R7/lib/libI810XvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libI810XvMC.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so.0 -unknown- xorg
+./usr/X11R7/lib/libIntelXvMC.so.0.0 -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so.0 -unknown- xorg
./usr/X11R7/lib/libchromeXvMC.so.0.0 -unknown- xorg
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.20 src/external/mit/xorg/lib/Makefile:1.21
--- src/external/mit/xorg/lib/Makefile:1.20 Sun Jul 18 07:07:09 2010
+++ src/external/mit/xorg/lib/Makefile Tue Jan 18 23:33:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/07/18 07:07:09 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2011/01/18 23:33:51 jmcneill Exp $
# build libraries for xorg
@@ -21,6 +21,8 @@
libXres libXtst libXvMC libXv libXxf86dga libXxf86misc libxkbui \
.WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=libI810XvMC
+SUBDIR+=libIntelXvMC
SUBDIR+=libchromeXvMC
.endif
SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.8 Sat May 22 23:04:01 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jan 18 23:33:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/05/22 23:04:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/01/18 23:33:52 jmcneill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= intel_drv
@@ -13,12 +13,13 @@
SRCS+= i915_3d.c i915_video.c i965_video.c
SRCS+= i830_xaa.c i830_render.c i915_render.c i965_render.c
SRCS+= i830_dri.c i830_exa.c
+SRCS+= i830_hwmc.c i915_hwmc.c i965_hwmc.c
MAN= intel.4
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
+CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DINTEL_XVMC
LDADD+= -ldrm_intel
Added files:
Index: src/external/mit/xorg/lib/libI810XvMC/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libI810XvMC/Makefile:1.1
--- /dev/null Tue Jan 18 23:33:52 2011
+++ src/external/mit/xorg/lib/libI810XvMC/Makefile Tue Jan 18 23:33:51 2011
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+LIB= IntelXvMC
+.PATH: ${X11SRCDIR.xf86-video-intel}/src/xvmc
+
+SRCS= I810XvMC.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-intel}/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/libI810XvMC/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libI810XvMC/shlib_version:1.1
--- /dev/null Tue Jan 18 23:33:52 2011
+++ src/external/mit/xorg/lib/libI810XvMC/shlib_version Tue Jan 18 23:33:51 2011
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+#
+major=0
+minor=0
Index: src/external/mit/xorg/lib/libIntelXvMC/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.1
--- /dev/null Tue Jan 18 23:33:52 2011
+++ src/external/mit/xorg/lib/libIntelXvMC/Makefile Tue Jan 18 23:33:51 2011
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+LIB= IntelXvMC
+#MKLINT= no
+.PATH: ${X11SRCDIR.xf86-video-intel}/src/xvmc
+
+SRCS= intel_xvmc.c \
+ intel_xvmc_dump.c \
+ i915_xvmc.c \
+ i965_xvmc.c \
+ intel_batchbuffer.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-intel}/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/libIntelXvMC/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libIntelXvMC/shlib_version:1.1
--- /dev/null Tue Jan 18 23:33:52 2011
+++ src/external/mit/xorg/lib/libIntelXvMC/shlib_version Tue Jan 18 23:33:51 2011
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+#
+major=0
+minor=0
