mutter: For portability's sake, ifndef NetBSD -> ifdef linux

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 02:27:37 2020 +0100
Changeset:	e41ae7400b95be8ed9996aae5217ede74b60391d

Modified Files:
	mutter/distinfo
	mutter/patches/patch-clutter_clutter_clutter-stage-view.c
	mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
	mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h

Log Message:
mutter: For portability's sake, ifndef NetBSD -> ifdef linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e41ae7400b95be8ed9996aae5217ede74b60391d

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

diffstat:
 mutter/distinfo                                           | 6 +++---
 mutter/patches/patch-clutter_clutter_clutter-stage-view.c | 6 +++---
 mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c      | 4 ++--
 mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs:
diff --git a/mutter/distinfo b/mutter/distinfo
index 9c503d0f1f..f939cc867d 100644
--- a/mutter/distinfo
+++ b/mutter/distinfo
@@ -4,6 +4,6 @@ SHA1 (mutter-3.38.1.tar.xz) = 1337658865e93d23baa3378386af244135c1c071
 RMD160 (mutter-3.38.1.tar.xz) = bef92552b0aa566ceb478bc56baa925c263c3260
 SHA512 (mutter-3.38.1.tar.xz) = 55a65d80c886b90da110de69fca8f2c92912b36d6244bd6fcb1e09507469b5d860fa888614a33170b2799574f521ee117fb289a768fa2af5059fe0da51835d31
 Size (mutter-3.38.1.tar.xz) = 2618944 bytes
-SHA1 (patch-clutter_clutter_clutter-stage-view.c) = 07d6ad3095db86c8355c2e78b80d786afad7920f
-SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = 35ad9c0f490eb7e4d356fff0902cf0546299fbfc
-SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = c9da9a06709343b9de6258f87f378a3f031f0b4e
+SHA1 (patch-clutter_clutter_clutter-stage-view.c) = abba7a702a612457ba56acf1ecfd9396d28d1a2c
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = 75547ffc2560860b6101a19165a3659bf799104e
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = 311de2a52624c081bd5baf4a6f878a6f1ebd4015
diff --git a/mutter/patches/patch-clutter_clutter_clutter-stage-view.c b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
index 319b060ce9..8b4a6f8889 100644
--- a/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
+++ b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
@@ -9,7 +9,7 @@ Disable Linux-only functions
  
    cogl_framebuffer_finish (COGL_FRAMEBUFFER (priv->shadow.framebuffer));
 -
-+#ifndef __NetBSD__
++#ifdef __linux__
    if (!cogl_dma_buf_handle_sync_read_start (prev_dma_buf_handle, error))
      return NULL;
  
@@ -25,7 +25,7 @@ Disable Linux-only functions
          }
      }
 -
-+#ifndef __NetBSD__
++#ifdef __linux__
    if (!cogl_dma_buf_handle_sync_read_end (prev_dma_buf_handle, error))
      {
        g_warning ("Failed to end DMA buffer read synchronization: %s",
@@ -43,7 +43,7 @@ Disable Linux-only functions
  err_mmap_current:
    cogl_dma_buf_handle_munmap (prev_dma_buf_handle, prev_data, NULL);
 -
-+#ifndef __NetBSD__
++#ifdef __linux__
  err_mmap_prev:
    cogl_dma_buf_handle_sync_read_end (current_dma_buf_handle, NULL);
  
diff --git a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
index deee6b29c1..d1e92c6d13 100644
--- a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
@@ -8,7 +8,7 @@ Disable Linux-only functions
  
  #include <errno.h>
  #include <gio/gio.h>
-+#ifndef __NetBSD__
++#ifdef __linux__
  #include <linux/dma-buf.h>
  #include <sys/ioctl.h>
 +#endif
@@ -20,7 +20,7 @@ Disable Linux-only functions
  }
  
 +
-+#ifndef __NetBSD__
++#ifdef __linux__
  static gboolean
  sync_read (CoglDmaBufHandle  *dmabuf_handle,
             uint64_t           start_or_end,
diff --git a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
index 0c1d9c3fea..8d48edfe31 100644
--- a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
@@ -8,7 +8,7 @@ Disable Linux-only functions
  COGL_EXPORT void
  cogl_dma_buf_handle_free (CoglDmaBufHandle *dmabuf_handle);
  
-+# ifndef __NetBSD__
++# ifdef __linux__
  COGL_EXPORT gboolean
  cogl_dma_buf_handle_sync_read_start (CoglDmaBufHandle  *dmabuf_handle,
                                       GError           **error);