diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-08-22 00:30:36 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-08-22 00:30:36 +0000 |
| commit | ca5aa37280ded3370d495f0c56c4a31dd633fdf8 (patch) | |
| tree | aa22147982f7a8b85b57e22e80b33b9a34961d4b /lib/libdrm/radeon | |
| parent | cde466ed50e79a55b4c7495ef43f87c8291c1ce8 (diff) | |
Merge libdrm 2.4.64. This changes the build to using the upstream
auto* build system and installing/using a libdrm specific set of drm
headers. Thanks to Emil Velikov for removing the GNU makeisms
upstream.
Diffstat (limited to 'lib/libdrm/radeon')
| -rw-r--r-- | lib/libdrm/radeon/Makefile | 36 | ||||
| -rw-r--r-- | lib/libdrm/radeon/libdrm_radeon.pc.in | 2 | ||||
| -rw-r--r-- | lib/libdrm/radeon/r600_pci_ids.h | 1 | ||||
| -rw-r--r-- | lib/libdrm/radeon/shlib_version | 2 |
4 files changed, 2 insertions, 39 deletions
diff --git a/lib/libdrm/radeon/Makefile b/lib/libdrm/radeon/Makefile deleted file mode 100644 index 7abdbdac6..000000000 --- a/lib/libdrm/radeon/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2013/05/19 14:09:56 jsg Exp $ -.include <bsd.xconf.mk> - -LIB= drm_radeon - -INCSDIR= ${X11BASE}/include/ - -CPPFLAGS+= -I${.CURDIR} \ - -I${.CURDIR}/.. \ - -I${X11BASE}/include \ - -I/usr/include/dev/pci/drm - -INCS= radeon_bo.h \ - radeon_cs.h \ - radeon_bo_gem.h \ - radeon_cs_gem.h \ - radeon_bo_int.h \ - radeon_cs_int.h \ - r600_pci_ids.h \ - radeon_surface.h - -SRCS= radeon_bo_gem.c \ - radeon_cs_gem.c \ - radeon_cs_space.c \ - radeon_bo.c \ - radeon_cs.c \ - radeon_surface.c \ - bof.c - - -PKGCONFIG= libdrm_radeon.pc - -LDADD+= -L${X11BASE}/lib -lX11 - -.include <bsd.lib.mk> -.include <bsd.xorg.mk> diff --git a/lib/libdrm/radeon/libdrm_radeon.pc.in b/lib/libdrm/radeon/libdrm_radeon.pc.in index 8e163a5d2..68ef0ab14 100644 --- a/lib/libdrm/radeon/libdrm_radeon.pc.in +++ b/lib/libdrm/radeon/libdrm_radeon.pc.in @@ -7,4 +7,4 @@ Name: libdrm_radeon Description: Userspace interface to kernel DRM services for radeon Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ldrm_radeon -Cflags: -I${includedir} -I/usr/include/dev/pci/drm +Cflags: -I${includedir} -I${includedir}/libdrm diff --git a/lib/libdrm/radeon/r600_pci_ids.h b/lib/libdrm/radeon/r600_pci_ids.h index 9d12587b8..a3b2eac8f 100644 --- a/lib/libdrm/radeon/r600_pci_ids.h +++ b/lib/libdrm/radeon/r600_pci_ids.h @@ -391,6 +391,7 @@ CHIPSET(0x6608, OLAND_6608, OLAND) CHIPSET(0x6610, OLAND_6610, OLAND) CHIPSET(0x6611, OLAND_6611, OLAND) CHIPSET(0x6613, OLAND_6613, OLAND) +CHIPSET(0x6617, OLAND_6617, OLAND) CHIPSET(0x6620, OLAND_6620, OLAND) CHIPSET(0x6621, OLAND_6621, OLAND) CHIPSET(0x6623, OLAND_6623, OLAND) diff --git a/lib/libdrm/radeon/shlib_version b/lib/libdrm/radeon/shlib_version deleted file mode 100644 index 012c14171..000000000 --- a/lib/libdrm/radeon/shlib_version +++ /dev/null @@ -1,2 +0,0 @@ -major=3 -minor=0 |