Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Enable XvMC support for Intel graphics chips
details: https://anonhg.NetBSD.org/src/rev/eea7659fff96
branches: trunk
changeset: 761024:eea7659fff96
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Tue Jan 18 23:33:50 2011 +0000
description:
Enable XvMC support for Intel graphics chips
diffstat:
distrib/sets/lists/xbase/md.amd64 | 8 +++-
distrib/sets/lists/xbase/md.i386 | 8 +++-
external/mit/xorg/lib/Makefile | 4 +-
external/mit/xorg/lib/libI810XvMC/Makefile | 25 +++++++++++
external/mit/xorg/lib/libI810XvMC/shlib_version | 4 +
external/mit/xorg/lib/libIntelXvMC/Makefile | 31 ++++++++++++++
external/mit/xorg/lib/libIntelXvMC/shlib_version | 4 +
external/mit/xorg/server/drivers/xf86-video-intel/Makefile | 5 +-
8 files changed, 84 insertions(+), 5 deletions(-)
diffs (154 lines):
diff -r c1279199d97e -r eea7659fff96 distrib/sets/lists/xbase/md.amd64
--- a/distrib/sets/lists/xbase/md.amd64 Tue Jan 18 23:12:37 2011 +0000
+++ b/distrib/sets/lists/xbase/md.amd64 Tue Jan 18 23:33:50 2011 +0000
@@ -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
diff -r c1279199d97e -r eea7659fff96 distrib/sets/lists/xbase/md.i386
--- a/distrib/sets/lists/xbase/md.i386 Tue Jan 18 23:12:37 2011 +0000
+++ b/distrib/sets/lists/xbase/md.i386 Tue Jan 18 23:33:50 2011 +0000
@@ -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
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Tue Jan 18 23:12:37 2011 +0000
+++ b/external/mit/xorg/lib/Makefile Tue Jan 18 23:33:50 2011 +0000
@@ -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 \
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/lib/libI810XvMC/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libI810XvMC/Makefile Tue Jan 18 23:33:50 2011 +0000
@@ -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>
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/lib/libI810XvMC/shlib_version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libI810XvMC/shlib_version Tue Jan 18 23:33:50 2011 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+#
+major=0
+minor=0
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/lib/libIntelXvMC/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libIntelXvMC/Makefile Tue Jan 18 23:33:50 2011 +0000
@@ -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>
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/lib/libIntelXvMC/shlib_version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libIntelXvMC/shlib_version Tue Jan 18 23:33:50 2011 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/01/18 23:33:51 jmcneill Exp $
+#
+major=0
+minor=0
diff -r c1279199d97e -r eea7659fff96 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jan 18 23:12:37 2011 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jan 18 23:33:50 2011 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index