01/01: gnu: orc: Fix broken header file.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit a1d1703a1dc6bfcd10f48fe707ee7ac65300a37d
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 15 18:18:38 2019 +0200

    gnu: orc: Fix broken header file.
    
    * gnu/packages/patches/orc-typedef-enum.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/gstreamer.scm (orc)[source](patches): New field.
---
 gnu/local.mk                                |  1 +
 gnu/packages/gstreamer.scm                  |  1 +
 gnu/packages/patches/orc-typedef-enum.patch | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index e7af37e..287ba10 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1181,6 +1181,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/openssl-c-rehash-in.patch               \
   %D%/packages/patches/openssl-CVE-2019-1559.patch             \
   %D%/packages/patches/open-zwave-hidapi.patch                 \
+  %D%/packages/patches/orc-typedef-enum.patch                  \
   %D%/packages/patches/orpheus-cast-errors-and-includes.patch  \
   %D%/packages/patches/osip-CVE-2017-7853.patch                        \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 0d95100..51b9d8f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -74,6 +74,7 @@
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/data/src/";
                                   "orc/orc-" version ".tar.xz"))
+              (patches (search-patches "orc-typedef-enum.patch"))
               (sha256
                (base32
                 "0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds"))))
diff --git a/gnu/packages/patches/orc-typedef-enum.patch 
b/gnu/packages/patches/orc-typedef-enum.patch
new file mode 100644
index 0000000..207bf32
--- /dev/null
+++ b/gnu/packages/patches/orc-typedef-enum.patch
@@ -0,0 +1,17 @@
+Orc 0.4.30 has a bug that causes duplicate symbols due to a missing typedef.
+
+Taken from upstream:
+https://gitlab.freedesktop.org/gstreamer/orc/merge_requests/32
+
+diff --git a/orc/orctarget.h b/orc/orctarget.h
+--- a/orc/orctarget.h
++++ b/orc/orctarget.h
+@@ -19,7 +19,7 @@ enum {
+   ORC_TARGET_FAST_DENORMAL = (1<<31)
+ };
+ 
+-enum {
++typedef enum {
+   ORC_TARGET_POWERPC_64BIT = (1<<0),
+   ORC_TARGET_POWERPC_LE = (1<<1),
+   ORC_TARGET_POWERPC_ALTIVEC = (1<<2),