gnu: gst-plugins-base: Fix build on 32bit.

* gnu/packages/patches/gst-plugins-base-fix-test-on-32bit.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gstreamer.scm (gst-plugins-base)[source]: Use it.
This commit is contained in:
Marius Bakke 2017-02-02 16:46:16 +01:00
parent de643f0c15
commit feeeee2418
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 36 additions and 1 deletions

View File

@ -602,6 +602,7 @@ dist_patch_DATA = \
%D%/packages/patches/grub-gets-undeclared.patch \ %D%/packages/patches/grub-gets-undeclared.patch \
%D%/packages/patches/grub-freetype.patch \ %D%/packages/patches/grub-freetype.patch \
%D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gsl-test-i686.patch \
%D%/packages/patches/gst-plugins-base-fix-test-on-32bit.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-arm-fixes.patch \ %D%/packages/patches/guile-arm-fixes.patch \
%D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-default-utf8.patch \

View File

@ -154,7 +154,9 @@ This package provides the core library and elements.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6")))) "040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6"))
(patches
(search-patches "gst-plugins-base-fix-test-on-32bit.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(propagated-inputs (propagated-inputs

View File

@ -0,0 +1,32 @@
This fixes a test failure on i686.
Patch copied from upstream source repository:
https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=5e2e111627871c566ffc6607eda8f4ef4699d040
From 5e2e111627871c566ffc6607eda8f4ef4699d040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 2 Feb 2017 14:56:39 +0200
Subject: [PATCH] multifdsink: Make sure to use a 64 bit integer for the
units-max property
---
tests/check/elements/multifdsink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/check/elements/multifdsink.c b/tests/check/elements/multifdsink.c
index af138cc92..951b1b9fa 100644
--- a/tests/check/elements/multifdsink.c
+++ b/tests/check/elements/multifdsink.c
@@ -869,7 +869,7 @@ GST_START_TEST (test_client_kick)
gint i, initial_buffers = 3, num_buffers = 0;
sink = setup_multifdsink ();
- g_object_set (sink, "units-max", initial_buffers, NULL);
+ g_object_set (sink, "units-max", (gint64) initial_buffers, NULL);
fail_if (pipe (pfd1) == -1);
fail_if (pipe (pfd2) == -1);
--
2.11.0