Sat Dec 29 13:38:54 2018 UTC ()
MesaLib: add headers for major()/minor() on Linux

Bump revision


(triaxx)
diff -r1.144 -r1.145 pkgsrc/graphics/MesaLib/Makefile
diff -r1.122 -r1.123 pkgsrc/graphics/MesaLib/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c
diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c
cvs diff -r1.144 -r1.145 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2018/11/23 08:06:30 1.144
+++ pkgsrc/graphics/MesaLib/Makefile 2018/12/29 13:38:53 1.145
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.144 2018/11/23 08:06:30 ryoon Exp $ 1# $NetBSD: Makefile,v 1.145 2018/12/29 13:38:53 triaxx Exp $
2 2
3DISTNAME= mesa-11.2.2 3DISTNAME= mesa-11.2.2
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 4PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5PKGREVISION= 8 5PKGREVISION= 9
6CATEGORIES= graphics x11 6CATEGORIES= graphics x11
7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ 7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mesa3d.org/ 11HOMEPAGE= https://www.mesa3d.org/
12COMMENT= The Mesa 3D Graphics Library 12COMMENT= The Mesa 3D Graphics Library
13LICENSE= mit 13LICENSE= mit
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= bison pkg-config gmake flex 16USE_TOOLS+= bison pkg-config gmake flex
17USE_LANGUAGES= c99 c++ 17USE_LANGUAGES= c99 c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.122 -r1.123 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2018/08/31 08:26:42 1.122
+++ pkgsrc/graphics/MesaLib/distinfo 2018/12/29 13:38:53 1.123
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.122 2018/08/31 08:26:42 wiz Exp $ 1$NetBSD: distinfo,v 1.123 2018/12/29 13:38:53 triaxx Exp $
2 2
3SHA1 (mesa-11.2.2.tar.xz) = c3805020be6fef77d3b96a5ddf4ddc256dee16ff 3SHA1 (mesa-11.2.2.tar.xz) = c3805020be6fef77d3b96a5ddf4ddc256dee16ff
4RMD160 (mesa-11.2.2.tar.xz) = 14bca7cc76015e53db2fafcebb8540f451be5aab 4RMD160 (mesa-11.2.2.tar.xz) = 14bca7cc76015e53db2fafcebb8540f451be5aab
5SHA512 (mesa-11.2.2.tar.xz) = fd1fcb1bc97e52784a4b3dedfd8c8ba95bc1b03a62b132d2e16154d076be7a6fabbca1bcba705a7916a1507d811d7f3e6c3488aa386d5e63891282fb1713ce52 5SHA512 (mesa-11.2.2.tar.xz) = fd1fcb1bc97e52784a4b3dedfd8c8ba95bc1b03a62b132d2e16154d076be7a6fabbca1bcba705a7916a1507d811d7f3e6c3488aa386d5e63891282fb1713ce52
6Size (mesa-11.2.2.tar.xz) = 7860932 bytes 6Size (mesa-11.2.2.tar.xz) = 7860932 bytes
7SHA1 (patch-configure) = 87f0f2e60f342c91b3aecab02d3a4d8940eadf0a 7SHA1 (patch-configure) = 87f0f2e60f342c91b3aecab02d3a4d8940eadf0a
8SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e 8SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
9SHA1 (patch-src_compiler_glsl_builtin__functions.cpp) = 1be4e67eda2105f375942c2991cf432e5d74e597 9SHA1 (patch-src_compiler_glsl_builtin__functions.cpp) = 1be4e67eda2105f375942c2991cf432e5d74e597
10SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5 10SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5
11SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 04b6ef8e755f226fbe3e6f2bea6c9e2a56a783ca 11SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 04b6ef8e755f226fbe3e6f2bea6c9e2a56a783ca
12SHA1 (patch-src_egl_main_eglglobals.c) = 2d81ae27f09162d23bc684456cc5fef48c042652 12SHA1 (patch-src_egl_main_eglglobals.c) = 2d81ae27f09162d23bc684456cc5fef48c042652
13SHA1 (patch-src_gallium_auxiliary_draw_draw__llvm.c) = fc1a313eed85042b7ac2db67c6fd1902074fb43a 13SHA1 (patch-src_gallium_auxiliary_draw_draw__llvm.c) = fc1a313eed85042b7ac2db67c6fd1902074fb43a
14SHA1 (patch-src_gallium_auxiliary_gallivm_lp__bld__intr.c) = 4c40981645675cfeb55bf28317158ebb6332268d 14SHA1 (patch-src_gallium_auxiliary_gallivm_lp__bld__intr.c) = 4c40981645675cfeb55bf28317158ebb6332268d
@@ -20,35 +20,35 @@ SHA1 (patch-src_gallium_auxiliary_util_u @@ -20,35 +20,35 @@ SHA1 (patch-src_gallium_auxiliary_util_u
20SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677 20SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
21SHA1 (patch-src_gallium_drivers_llvmpipe_lp__state__fs.c) = b14ca18ae1dc03901b197c86e67052bbb154a81f 21SHA1 (patch-src_gallium_drivers_llvmpipe_lp__state__fs.c) = b14ca18ae1dc03901b197c86e67052bbb154a81f
22SHA1 (patch-src_gallium_drivers_llvmpipe_lp__state__setup.c) = 1d6c24bc598da9945ce75c1cc6a2334228d66b41 22SHA1 (patch-src_gallium_drivers_llvmpipe_lp__state__setup.c) = 1d6c24bc598da9945ce75c1cc6a2334228d66b41
23SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc 23SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc
24SHA1 (patch-src_gallium_drivers_nouveau_nouveau__debug.h) = dd60605a9d89e573ad2cdeb67b11450b0eedeebf 24SHA1 (patch-src_gallium_drivers_nouveau_nouveau__debug.h) = dd60605a9d89e573ad2cdeb67b11450b0eedeebf
25SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e 25SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e
26SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 26SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
27SHA1 (patch-src_gallium_drivers_r600_r600__llvm.c) = 37ffa4df519df4b7a35b686448e823200d5144ae 27SHA1 (patch-src_gallium_drivers_r600_r600__llvm.c) = 37ffa4df519df4b7a35b686448e823200d5144ae
28SHA1 (patch-src_gallium_drivers_radeon_radeon__llvm__util.c) = 63852f9abaa4d75d0043ae748bba718a35459a11 28SHA1 (patch-src_gallium_drivers_radeon_radeon__llvm__util.c) = 63852f9abaa4d75d0043ae748bba718a35459a11
29SHA1 (patch-src_gallium_drivers_radeon_radeon__setup__tgsi__llvm.c) = 7957999b555c9c2e68a1d9b2eece5989e6612ff3 29SHA1 (patch-src_gallium_drivers_radeon_radeon__setup__tgsi__llvm.c) = 7957999b555c9c2e68a1d9b2eece5989e6612ff3
30SHA1 (patch-src_gallium_drivers_radeonsi_si__shader.c) = 44b790ee0d8b843421114b61ddae6a4d4ef2a099 30SHA1 (patch-src_gallium_drivers_radeonsi_si__shader.c) = 44b790ee0d8b843421114b61ddae6a4d4ef2a099
31SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280 31SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280
32SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a 32SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a
33SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e 33SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 7b9c57c2b5a0f5d244c27d4c6164736853e43b47
34SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df 34SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df
35SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc 35SHA1 (patch-src_gbm_main_gbm.c) = e49c319c4a9a63433983ec024ccdfeb966b418b0
36SHA1 (patch-src_glsl_ralloc.c) = 63c8e40b9f74404033c20c5c9a00c5f6d8df6433 36SHA1 (patch-src_glsl_ralloc.c) = 63c8e40b9f74404033c20c5c9a00c5f6d8df6433
37SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a 37SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a
38SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b 38SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b
39SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69 39SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69
40SHA1 (patch-src_loader_Makefile.in) = 30454c207924183c881a84d31458fdc0ddb1680b 40SHA1 (patch-src_loader_Makefile.in) = 30454c207924183c881a84d31458fdc0ddb1680b
41SHA1 (patch-src_loader_loader.c) = f99b13451f4f932031e876cd611ab746ec5caf1b 41SHA1 (patch-src_loader_loader.c) = 8dca08425dd0817eb5920705d61a257022240957
42SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55 42SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55
43SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56 43SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56
44SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21 44SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21
45SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 53026e520a510e54494760a3fa05af6f15dfb9d8 45SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 53026e520a510e54494760a3fa05af6f15dfb9d8
46SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620 46SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620
47SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0 47SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0
48SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd44d7ce8bf 48SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd44d7ce8bf
49SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e 49SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e
50SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = b87644c5ef5fb5d71c3260026d3afdfbaee749a8 50SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = b87644c5ef5fb5d71c3260026d3afdfbaee749a8
51SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3 51SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3
52SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe 52SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe
53SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4 53SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4
54SHA1 (patch-src_mesa_main_context.c) = 695b0e04cbd08dfed46b4dae5f9602b35e21f5b3 54SHA1 (patch-src_mesa_main_context.c) = 695b0e04cbd08dfed46b4dae5f9602b35e21f5b3
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_winsys_svga_drm_vmw__screen.c (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_winsys_svga_drm_vmw__screen.c 2015/04/25 11:19:18 1.1
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_winsys_svga_drm_vmw__screen.c 2018/12/29 13:38:53 1.2
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen.c,v 1.1 2015/04/25 11:19:18 tnn Exp $ 1$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen.c,v 1.2 2018/12/29 13:38:53 triaxx Exp $
2 2
3Solaris needs sys/mkdev.h for major(2). 3* Solaris needs sys/mkdev.h for major(2).
 4* Linux needs sys/sysmacros.h for major(2).
4 5
5--- src/gallium/winsys/svga/drm/vmw_screen.c.orig 2014-09-12 21:30:32.000000000 +0000 6--- src/gallium/winsys/svga/drm/vmw_screen.c.orig 2016-01-22 15:44:31.000000000 +0000
6+++ src/gallium/winsys/svga/drm/vmw_screen.c 7+++ src/gallium/winsys/svga/drm/vmw_screen.c
7@@ -32,6 +32,9 @@ 8@@ -32,6 +32,11 @@
8 #include "pipe/p_compiler.h" 9 #include "pipe/p_compiler.h"
9 #include "util/u_hash_table.h" 10 #include "util/u_hash_table.h"
10 #include <sys/types.h> 11 #include <sys/types.h>
11+#ifdef __sun 12+#ifdef __sun
12+#include <sys/mkdev.h> /* for major(2) */ 13+#include <sys/mkdev.h> /* for major(2) */
 14+#elif defined(__linux__)
 15+#include <sys/sysmacros.h>
13+#endif 16+#endif
14 #include <sys/stat.h> 17 #include <sys/stat.h>
15 #include <unistd.h> 18 #include <unistd.h>
16  19
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gbm_main_gbm.c (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gbm_main_gbm.c 2015/04/25 11:19:18 1.1
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gbm_main_gbm.c 2018/12/29 13:38:53 1.2
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1$NetBSD: patch-src_gbm_main_gbm.c,v 1.1 2015/04/25 11:19:18 tnn Exp $ 1$NetBSD: patch-src_gbm_main_gbm.c,v 1.2 2018/12/29 13:38:53 triaxx Exp $
2 2
3Solaris needs sys/mkdev.h for major(2). 3* Solaris needs sys/mkdev.h for major(2).
 4* Linux needs sys/sysmacros.h for major(2).
4 5
5--- src/gbm/main/gbm.c.orig 2015-03-21 00:51:18.000000000 +0000 6--- src/gbm/main/gbm.c.orig 2016-05-01 12:48:59.000000000 +0000
6+++ src/gbm/main/gbm.c 7+++ src/gbm/main/gbm.c
7@@ -35,6 +35,9 @@ 8@@ -35,6 +35,11 @@
8 #include <stdint.h> 9 #include <stdint.h>
9  10
10 #include <sys/types.h> 11 #include <sys/types.h>
11+#ifdef __sun 12+#ifdef __sun
12+#include <sys/mkdev.h> /* for major(2) */ 13+#include <sys/mkdev.h> /* for major(2) */
 14+#elif defined(__linux__)
 15+#include <sys/sysmacros.h>
13+#endif 16+#endif
14 #include <sys/stat.h> 17 #include <sys/stat.h>
15 #include <unistd.h> 18 #include <unistd.h>
16 #include <errno.h> 19 #include <errno.h>
cvs diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/patches/Attic/patch-src_loader_loader.c (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-src_loader_loader.c 2015/09/26 08:45:02 1.2
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-src_loader_loader.c 2018/12/29 13:38:53 1.3
@@ -1,29 +1,43 @@ @@ -1,29 +1,43 @@
1$NetBSD: patch-src_loader_loader.c,v 1.2 2015/09/26 08:45:02 tnn Exp $ 1$NetBSD: patch-src_loader_loader.c,v 1.3 2018/12/29 13:38:53 triaxx Exp $
2 2
3FreeBSD & DragonFly support for libdevq. From FreeBSD ports(?) 3* FreeBSD & DragonFly support for libdevq. From FreeBSD ports(?).
 4* Linux needs sys/sysmacros.h for major(2).
4 5
5--- src/loader/loader.c.orig 2015-09-10 18:07:21.000000000 +0000 6--- src/loader/loader.c.orig 2016-05-09 12:20:52.000000000 +0000
6+++ src/loader/loader.c 7+++ src/loader/loader.c
7@@ -70,7 +70,7 @@ 8@@ -70,7 +70,7 @@
8 #include <stdarg.h> 9 #include <stdarg.h>
9 #include <stdio.h> 10 #include <stdio.h>
10 #include <string.h> 11 #include <string.h>
11-#ifdef HAVE_LIBUDEV 12-#ifdef HAVE_LIBUDEV
12+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ) 13+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
13 #include <assert.h> 14 #include <assert.h>
14 #include <dlfcn.h> 15 #include <dlfcn.h>
15 #include <unistd.h> 16 #include <unistd.h>
16@@ -505,6 +505,53 @@ sysfs_get_pci_id_for_fd(int fd, int *ven 17@@ -81,8 +81,12 @@
 18 #endif
 19 #endif
 20 #ifdef HAVE_SYSFS
 21+#if defined(__linux__)
 22+#include <sys/sysmacros.h>
 23+#else
 24 #include <sys/types.h>
 25 #endif
 26+#endif
 27 #include "loader.h"
 28
 29 #ifdef HAVE_LIBDRM
 30@@ -505,6 +509,53 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
17 } 31 }
18 #endif 32 #endif
19  33
20+#if defined(HAVE_LIBDEVQ) 34+#if defined(HAVE_LIBDEVQ)
21+#include <libdevq.h> 35+#include <libdevq.h>
22+ 36+
23+static void *devq_handle = NULL; 37+static void *devq_handle = NULL;
24+ 38+
25+static void * 39+static void *
26+devq_dlopen_handle(void) 40+devq_dlopen_handle(void)
27+{ 41+{
28+ if (!devq_handle) { 42+ if (!devq_handle) {
29+ devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY); 43+ devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY);
@@ -57,26 +71,26 @@ FreeBSD & DragonFly support for libdevq. @@ -57,26 +71,26 @@ FreeBSD & DragonFly support for libdevq.
57+ log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n"); 71+ log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n");
58+ goto out; 72+ goto out;
59+ } 73+ }
60+ 74+
61+out: 75+out:
62+ return (*chip_id >= 0); 76+ return (*chip_id >= 0);
63+} 77+}
64+ 78+
65+#endif 79+#endif
66+ 80+
67 #if defined(HAVE_LIBDRM) 81 #if defined(HAVE_LIBDRM)
68 /* for i915 */ 82 /* for i915 */
69 #include <i915_drm.h> 83 #include <i915_drm.h>
70@@ -588,6 +635,12 @@ loader_get_pci_id_for_fd(int fd, int *ve 84@@ -588,6 +639,12 @@ loader_get_pci_id_for_fd(int fd, int *ve
71 if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id)) 85 if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
72 return 1; 86 return 1;
73 #endif 87 #endif
74+ 88+
75+#if HAVE_LIBDEVQ 89+#if HAVE_LIBDEVQ
76+ if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id)) 90+ if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id))
77+ return 1; 91+ return 1;
78+#endif 92+#endif
79+ 93+
80 #if HAVE_LIBDRM 94 #if HAVE_LIBDRM
81 if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id)) 95 if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
82 return 1; 96 return 1;