CVS commit: pkgsrc/graphics/MesaLib

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sat Dec 29 13:38:54 UTC 2018

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile distinfo
        pkgsrc/graphics/MesaLib/patches:
            patch-src_gallium_winsys_svga_drm_vmw__screen.c
            patch-src_gbm_main_gbm.c patch-src_loader_loader.c

Log Message:
MesaLib: add headers for major()/minor() on Linux

Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c \
    pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.144 pkgsrc/graphics/MesaLib/Makefile:1.145
--- pkgsrc/graphics/MesaLib/Makefile:1.144      Fri Nov 23 08:06:30 2018
+++ pkgsrc/graphics/MesaLib/Makefile    Sat Dec 29 13:38:53 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.144 2018/11/23 08:06:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.145 2018/12/29 13:38:53 triaxx Exp $
 
 DISTNAME=      mesa-11.2.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    graphics x11
 MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/MesaLib/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.122 pkgsrc/graphics/MesaLib/distinfo:1.123
--- pkgsrc/graphics/MesaLib/distinfo:1.122      Fri Aug 31 08:26:42 2018
+++ pkgsrc/graphics/MesaLib/distinfo    Sat Dec 29 13:38:53 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.122 2018/08/31 08:26:42 wiz Exp $
+$NetBSD: distinfo,v 1.123 2018/12/29 13:38:53 triaxx Exp $
 
 SHA1 (mesa-11.2.2.tar.xz) = c3805020be6fef77d3b96a5ddf4ddc256dee16ff
 RMD160 (mesa-11.2.2.tar.xz) = 14bca7cc76015e53db2fafcebb8540f451be5aab
@@ -30,15 +30,15 @@ SHA1 (patch-src_gallium_drivers_radeon_r
 SHA1 (patch-src_gallium_drivers_radeonsi_si__shader.c) = 44b790ee0d8b843421114b61ddae6a4d4ef2a099
 SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280
 SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a
-SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e
+SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 7b9c57c2b5a0f5d244c27d4c6164736853e43b47
 SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df
-SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc
+SHA1 (patch-src_gbm_main_gbm.c) = e49c319c4a9a63433983ec024ccdfeb966b418b0
 SHA1 (patch-src_glsl_ralloc.c) = 63c8e40b9f74404033c20c5c9a00c5f6d8df6433
 SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a
 SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b
 SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69
 SHA1 (patch-src_loader_Makefile.in) = 30454c207924183c881a84d31458fdc0ddb1680b
-SHA1 (patch-src_loader_loader.c) = f99b13451f4f932031e876cd611ab746ec5caf1b
+SHA1 (patch-src_loader_loader.c) = 8dca08425dd0817eb5920705d61a257022240957
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56
 SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21

Index: pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c:1.1 pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c:1.2
--- pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c:1.1 Sat Apr 25 11:19:18 2015
+++ pkgsrc/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen.c     Sat Dec 29 13:38:53 2018
@@ -1,15 +1,18 @@
-$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen.c,v 1.2 2018/12/29 13:38:53 triaxx Exp $
 
-Solaris needs sys/mkdev.h for major(2).
+* Solaris needs sys/mkdev.h for major(2).
+* Linux needs sys/sysmacros.h for major(2).
 
---- src/gallium/winsys/svga/drm/vmw_screen.c.orig      2014-09-12 21:30:32.000000000 +0000
+--- src/gallium/winsys/svga/drm/vmw_screen.c.orig      2016-01-22 15:44:31.000000000 +0000
 +++ src/gallium/winsys/svga/drm/vmw_screen.c
-@@ -32,6 +32,9 @@
+@@ -32,6 +32,11 @@
  #include "pipe/p_compiler.h"
  #include "util/u_hash_table.h"
  #include <sys/types.h>
 +#ifdef __sun
 +#include <sys/mkdev.h> /* for major(2) */
++#elif defined(__linux__)
++#include <sys/sysmacros.h>
 +#endif
  #include <sys/stat.h>
  #include <unistd.h>
Index: pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c:1.1 pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c:1.2
--- pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c:1.1        Sat Apr 25 11:19:18 2015
+++ pkgsrc/graphics/MesaLib/patches/patch-src_gbm_main_gbm.c    Sat Dec 29 13:38:53 2018
@@ -1,15 +1,18 @@
-$NetBSD: patch-src_gbm_main_gbm.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_gbm_main_gbm.c,v 1.2 2018/12/29 13:38:53 triaxx Exp $
 
-Solaris needs sys/mkdev.h for major(2).
+* Solaris needs sys/mkdev.h for major(2).
+* Linux needs sys/sysmacros.h for major(2).
 
---- src/gbm/main/gbm.c.orig    2015-03-21 00:51:18.000000000 +0000
+--- src/gbm/main/gbm.c.orig    2016-05-01 12:48:59.000000000 +0000
 +++ src/gbm/main/gbm.c
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,11 @@
  #include <stdint.h>
  
  #include <sys/types.h>
 +#ifdef __sun
 +#include <sys/mkdev.h> /* for major(2) */
++#elif defined(__linux__)
++#include <sys/sysmacros.h>
 +#endif
  #include <sys/stat.h>
  #include <unistd.h>

Index: pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c:1.2 pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c:1.3
--- pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c:1.2       Sat Sep 26 08:45:02 2015
+++ pkgsrc/graphics/MesaLib/patches/patch-src_loader_loader.c   Sat Dec 29 13:38:53 2018
@@ -1,8 +1,9 @@
-$NetBSD: patch-src_loader_loader.c,v 1.2 2015/09/26 08:45:02 tnn Exp $
+$NetBSD: patch-src_loader_loader.c,v 1.3 2018/12/29 13:38:53 triaxx Exp $
 
-FreeBSD & DragonFly support for libdevq. From FreeBSD ports(?)
+* FreeBSD & DragonFly support for libdevq. From FreeBSD ports(?).
+* Linux needs sys/sysmacros.h for major(2).
 
---- src/loader/loader.c.orig   2015-09-10 18:07:21.000000000 +0000
+--- src/loader/loader.c.orig   2016-05-09 12:20:52.000000000 +0000
 +++ src/loader/loader.c
 @@ -70,7 +70,7 @@
  #include <stdarg.h>
@@ -13,7 +14,20 @@ FreeBSD & DragonFly support for libdevq.
  #include <assert.h>
  #include <dlfcn.h>
  #include <unistd.h>
-@@ -505,6 +505,53 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
+@@ -81,8 +81,12 @@
+ #endif
+ #endif
+ #ifdef HAVE_SYSFS
++#if defined(__linux__)
++#include <sys/sysmacros.h>
++#else
+ #include <sys/types.h>
+ #endif
++#endif
+ #include "loader.h"
+ 
+ #ifdef HAVE_LIBDRM
+@@ -505,6 +509,53 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
  }
  #endif
  
@@ -67,7 +81,7 @@ FreeBSD & DragonFly support for libdevq.
  #if defined(HAVE_LIBDRM)
  /* for i915 */
  #include <i915_drm.h>
-@@ -588,6 +635,12 @@ loader_get_pci_id_for_fd(int fd, int *ve
+@@ -588,6 +639,12 @@ loader_get_pci_id_for_fd(int fd, int *ve
     if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
        return 1;
  #endif