From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 62873@debbugs.gnu.org
Cc: rg@raghavgururajan.name
Subject: [bug#62873] [PATCH gnome-team 6/6] gnu: gst-plugins-base: Fix build.
Date: Sun, 16 Apr 2023 07:47:00 +0200 [thread overview]
Message-ID: <43da6ec9e3cd102cdd1403d144009ba15b2d6769.camel@gmail.com> (raw)
In-Reply-To: <e2c5a57969bb335e861866c69d372b2ffac040a5.camel@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.
---
As a follow-up to the master merge, the good, bad, and ugly plugins
as well as gst-editing-services build with this simple trick.
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 72b73761d8..1d7c5696f5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1303,6 +1303,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 0d051438e3..486ebe6dcd 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -554,7 +554,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
next prev parent reply other threads:[~2023-04-16 5:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-15 21:39 [bug#62873] [PATCH gnome-team 0/5] Merge master into gnome-team Liliana Marie Prikler
2023-03-27 18:27 ` [bug#62873] [PATCH gnome-team 1/4] gnu: meson: Update to 1.1 Liliana Marie Prikler
2023-04-08 14:04 ` [bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir Maxim Cournoyer
2023-04-08 15:22 ` [bug#62873] [PATCH gnome-team 2/4] build: meson: Explicitly invoke "meson setup" instead of just "meson" Maxim Cournoyer
2023-04-13 13:33 ` [bug#62873] [PATCH gnome-team 4/4] gnu: gtk+-3: Fix build Liliana Marie Prikler
2023-04-15 21:30 ` [bug#62873] [PATCH] Merge branch 'master' into gnome-team Liliana Marie Prikler
2023-04-16 5:47 ` Liliana Marie Prikler [this message]
2023-04-18 16:42 ` [bug#62873] [PATCH gnome-team 0/5] Merge master " Maxim Cournoyer
2023-04-18 18:30 ` Liliana Marie Prikler
2023-04-20 1:41 ` Maxim Cournoyer
2023-04-30 15:50 ` bug#62873: " 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43da6ec9e3cd102cdd1403d144009ba15b2d6769.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=62873@debbugs.gnu.org \
--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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).