all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 63499@debbugs.gnu.org
Cc: maxim.cournoyer@gmail.com, rg@raghavgururajan.name,
	liliana.prikler@gmail.com
Subject: [bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build.
Date: Sun, 16 Apr 2023 07:47:00 +0200	[thread overview]
Message-ID: <2c36d93661d5cf9d3a7c60068571225716f129bd.1684060546.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1684060546.git.liliana.prikler@gmail.com>

* gnu/packages/patches/gst-plugins-base-fix-broken-test.patch: New file.
* gnu/packages/gstreamer.scm (gst-plugins-base)[patches]: Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gstreamer.scm                    |  3 ++-
 .../gst-plugins-base-fix-broken-test.patch    | 22 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 43d6077943..0ff787e8f3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1316,6 +1316,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/guile-present-coding.patch		\
   %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
   %D%/packages/patches/guile-emacs-fix-configure.patch		\
+  %D%/packages/patches/gst-plugins-base-fix-broken-test.patch		\
   %D%/packages/patches/gtk2-fix-builder-test.patch		\
   %D%/packages/patches/gtk2-harden-list-store.patch		\
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 8971c11479..f7e5b397fd 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -550,7 +550,8 @@ (define-public gst-plugins-base
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
+        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))
+      (patches (search-patches "gst-plugins-base-fix-broken-test.patch"))))
     (build-system meson-build-system)
     (propagated-inputs
      (list glib                     ;required by gstreamer-sdp-1.0.pc
diff --git a/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
new file mode 100644
index 0000000000..2785983d8d
--- /dev/null
+++ b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
@@ -0,0 +1,22 @@
+Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c
+===================================================================
+--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c
++++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c
+@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem)
+ 
+   alloc = gst_fd_allocator_new ();
+   fail_unless (alloc);
+-  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED);
++  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE);
+ 
+   fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
+   fail_unless (info.data[5] == '5');
+@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem)
+   gst_memory_unmap (mem, &info);
+ 
+   gst_memory_unref (mem);
+-  fail_unless (g_close (fd, NULL) == 0);
++  fail_unless (g_close (fd, NULL));
+   gst_object_unref (alloc);
+ }
+ 
-- 
2.39.2





  reply	other threads:[~2023-05-14 10:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-14 10:35 [bug#63499] [PATCH gnome-team 0/3] To GTK and beyond Liliana Marie Prikler
2023-04-16  5:47 ` Liliana Marie Prikler [this message]
2023-05-15 13:46   ` [bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build Maxim Cournoyer
2023-05-15 19:32     ` Liliana Marie Prikler
2023-05-13 18:50 ` [bug#63499] [PATCH gnome-team 2/3] gnu: gtk: Update to 4.10.3 Liliana Marie Prikler
2023-05-15 13:47   ` Maxim Cournoyer
2023-05-13 20:27 ` [bug#63499] [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build Liliana Marie Prikler
2023-05-15 13:49   ` Maxim Cournoyer
2023-05-15 18:27     ` Liliana Marie Prikler
2023-05-15 19:44       ` Maxim Cournoyer
2023-05-27 14:25         ` bug#63499: " Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2c36d93661d5cf9d3a7c60068571225716f129bd.1684060546.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=63499@debbugs.gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.