build updates for libdrm 2.4.11 and xf86-video-intel 2.7.1.
thanks to snj@ for most of this.
This commit is contained in:
parent
4872798d7b
commit
3b81cc3605
4
external/mit/xorg/lib/Makefile
vendored
4
external/mit/xorg/lib/Makefile
vendored
@ -1,9 +1,9 @@
|
||||
# $NetBSD: Makefile,v 1.12 2009/04/20 04:03:49 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2009/06/09 03:05:36 mrg Exp $
|
||||
|
||||
# build libraries for xorg
|
||||
|
||||
SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \
|
||||
libXau libXdmcp libdrm pixman xkbdata \
|
||||
libXau libXdmcp libdrm libdrm_intel pixman xkbdata \
|
||||
.WAIT \
|
||||
dri fontconfig libSM libX11 \
|
||||
.WAIT \
|
||||
|
5
external/mit/xorg/lib/libdrm/Makefile
vendored
5
external/mit/xorg/lib/libdrm/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2009/06/09 03:05:37 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,8 +7,9 @@ LIB= drm
|
||||
|
||||
SRCS= xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
|
||||
|
||||
INCS= xf86drm.h xf86mm.h
|
||||
INCS= xf86drm.h intel_bufmgr.h xf86drmMode.h
|
||||
INCSDIR=${X11INCDIR}/X11
|
||||
.PATH: ${X11SRCDIR.${LIB}}/libdrm/intel
|
||||
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
|
||||
|
||||
|
9
external/mit/xorg/lib/libdrm/drm/Makefile
vendored
9
external/mit/xorg/lib/libdrm/drm/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:21 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2009/06/09 03:05:37 mrg Exp $
|
||||
|
||||
# install include/X11/drm files
|
||||
|
||||
@ -7,8 +7,11 @@
|
||||
.PATH: ${X11SRCDIR.drm}/shared-core
|
||||
.PATH: ${X11SRCDIR.drm}/bsd-core
|
||||
|
||||
INCS= drm.h drm_sarea.h i915_drm.h mach64_drm.h mga_drm.h r128_drm.h \
|
||||
r300_reg.h radeon_drm.h savage_drm.h sis_drm.h via_3d_reg.h via_drm.h
|
||||
INCS= drm.h drm_sarea.h drm_mode.h \
|
||||
i915_drm.h mach64_drm.h mga_drm.h nouveau_drm.h \
|
||||
r128_drm.h r300_reg.h radeon_drm.h \
|
||||
savage_drm.h sis_drm.h via_3d_reg.h via_drm.h \
|
||||
xgi_drm.h
|
||||
INCSDIR=${X11INCDIR}/X11/drm
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
4
external/mit/xorg/lib/libdrm/shlib_version
vendored
4
external/mit/xorg/lib/libdrm/shlib_version
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:13 christos Exp $
|
||||
# $NetBSD: shlib_version,v 1.3 2009/06/09 03:05:37 mrg Exp $
|
||||
#
|
||||
major=3
|
||||
minor=0
|
||||
minor=1
|
||||
|
17
external/mit/xorg/lib/libdrm_intel/Makefile
vendored
Normal file
17
external/mit/xorg/lib/libdrm_intel/Makefile
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
# $NetBSD: Makefile,v 1.1 2009/06/09 03:05:37 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
LIB= drm_intel
|
||||
.PATH: ${X11SRCDIR.drm}/libdrm/intel
|
||||
|
||||
SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
|
||||
|
||||
INCS= intel_bufmgr.h
|
||||
INCSDIR=${X11INCDIR}
|
||||
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
4
external/mit/xorg/lib/libdrm_intel/shlib_version
vendored
Normal file
4
external/mit/xorg/lib/libdrm_intel/shlib_version
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# $NetBSD: shlib_version,v 1.1 2009/06/09 03:05:37 mrg Exp $
|
||||
#
|
||||
major=0
|
||||
minor=0
|
@ -1,14 +1,14 @@
|
||||
# $NetBSD: Makefile,v 1.5 2008/08/31 19:58:06 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2009/06/09 03:05:36 mrg Exp $
|
||||
|
||||
DRIVER= xf86-video-intel
|
||||
DRIVER_NAME= intel_drv
|
||||
|
||||
SRCS= i810_accel.c i810_cursor.c i810_dga.c i810_driver.c
|
||||
SRCS+= i810_io.c i810_memory.c i810_video.c i810_wmark.c
|
||||
SRCS+= i830_3d.c i830_accel.c i830_bios.c i830_crt.c
|
||||
SRCS+= i830_cursor.c i830_debug.c i830_display.c
|
||||
SRCS+= i830_quirks.c i830_driver.c i830_dvo.c i830_hdmi.c
|
||||
SRCS+= i830_i2c.c i830_io.c i830_lvds.c i830_memory.c
|
||||
SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c
|
||||
SRCS+= i810_driver.c i810_io.c i810_memory.c i810_video.c
|
||||
SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c
|
||||
SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c
|
||||
SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
|
||||
SRCS+= i830_hdmi.c i830_i2c.c i830_io.c i830_lvds.c i830_memory.c
|
||||
SRCS+= i830_modes.c i830_video.c i830_sdvo.c i830_tv.c
|
||||
SRCS+= i915_3d.c i915_video.c i965_video.c
|
||||
SRCS+= i830_xaa.c i830_render.c i915_render.c i965_render.c
|
||||
@ -20,6 +20,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
|
||||
CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
|
||||
|
||||
LDADD+= -ldrm_intel
|
||||
|
||||
.include "../Makefile.xf86-driver"
|
||||
|
||||
SUBDIR= ch7017 ch7xxx ivch sil164 tfp410
|
||||
|
Loading…
Reference in New Issue
Block a user