aboutsummaryrefslogtreecommitdiff
path: root/multimedia/gstreamer1-plugins-bad
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2020-08-30 06:52:08 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2020-08-30 06:52:08 +0000
commitbd482d02cb1a2c599d481f7c1ebd733a4606d585 (patch)
tree57a48305186113044fac1c9f15d48f3c69bd9f90 /multimedia/gstreamer1-plugins-bad
parent1cbce2fe1571269350caa91f028c521e5f5e69af (diff)
downloadports-bd482d02cb1a2c599d481f7c1ebd733a4606d585.tar.gz
ports-bd482d02cb1a2c599d481f7c1ebd733a4606d585.zip
audio/gstreamer1-plugins-lv2: fix build on current
Notes
Notes: svn path=/head/; revision=546969
Diffstat (limited to 'multimedia/gstreamer1-plugins-bad')
-rw-r--r--multimedia/gstreamer1-plugins-bad/files/patch-git_a0cd455d142
1 files changed, 142 insertions, 0 deletions
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-git_a0cd455d b/multimedia/gstreamer1-plugins-bad/files/patch-git_a0cd455d
new file mode 100644
index 000000000000..dda40dab4b28
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-bad/files/patch-git_a0cd455d
@@ -0,0 +1,142 @@
+From a0cd455dd0e0375c6395fe732173225ea7e18562 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@gnu.org>
+Date: Fri, 20 Mar 2020 15:49:06 +0100
+Subject: [PATCH] lv2: Make it build with -fno-common
+
+GCC 10 defaults to -fno-common. This means that global variables shared
+across multiple translation units should be declared as 'extern' in
+header files and defined in exactly one C file. See:
+https://gcc.gnu.org/gcc-10/porting_to.html
+
+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125>
+---
+ ext/lv2/gstlv2.c | 33 ++++++++++++++++++++++++++
+ ext/lv2/gstlv2.h | 62 ++++++++++++++++++++++++------------------------
+ 2 files changed, 64 insertions(+), 31 deletions(-)
+
+diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
+index 60d502f41a..7feeee1921 100644
+--- ext/lv2/gstlv2.c
++++ ext/lv2/gstlv2.c
+@@ -69,6 +69,39 @@ GST_DEBUG_CATEGORY (lv2_debug);
+ #error "Unsupported OS"
+ #endif
+
++LilvWorld *world = NULL;
++LilvNode *atom_class = NULL;
++LilvNode *audio_class = NULL;
++LilvNode *control_class = NULL;
++LilvNode *cv_class = NULL;
++LilvNode *event_class = NULL;
++LilvNode *input_class = NULL;
++LilvNode *output_class = NULL;
++LilvNode *preset_class = NULL;
++LilvNode *state_iface = NULL;
++LilvNode *state_uri = NULL;
++
++LilvNode *integer_prop = NULL;
++LilvNode *toggled_prop = NULL;
++LilvNode *designation_pred = NULL;
++LilvNode *in_place_broken_pred = NULL;
++LilvNode *optional_pred = NULL;
++LilvNode *group_pred = NULL;
++LilvNode *supports_event_pred = NULL;
++LilvNode *label_pred = NULL;
++
++LilvNode *center_role = NULL;
++LilvNode *left_role = NULL;
++LilvNode *right_role = NULL;
++LilvNode *rear_center_role = NULL;
++LilvNode *rear_left_role = NULL;
++LilvNode *rear_right_role = NULL;
++LilvNode *lfe_role = NULL;
++LilvNode *center_left_role = NULL;
++LilvNode *center_right_role = NULL;
++LilvNode *side_left_role = NULL;
++LilvNode *side_right_role = NULL;
++
+ GstStructure *lv2_meta_all = NULL;
+
+ static void
+diff --git a/ext/lv2/gstlv2.h b/ext/lv2/gstlv2.h
+index 177f9b2c19..9f72582294 100644
+--- ext/lv2/gstlv2.h
++++ ext/lv2/gstlv2.h
+@@ -28,40 +28,40 @@
+
+ #include "gstlv2utils.h"
+
+-LilvWorld *world;
+-LilvNode *atom_class;
+-LilvNode *audio_class;
+-LilvNode *control_class;
+-LilvNode *cv_class;
+-LilvNode *event_class;
+-LilvNode *input_class;
+-LilvNode *output_class;
+-LilvNode *preset_class;
+-LilvNode *state_iface;
+-LilvNode *state_uri;
++extern LilvWorld *world;
++extern LilvNode *atom_class;
++extern LilvNode *audio_class;
++extern LilvNode *control_class;
++extern LilvNode *cv_class;
++extern LilvNode *event_class;
++extern LilvNode *input_class;
++extern LilvNode *output_class;
++extern LilvNode *preset_class;
++extern LilvNode *state_iface;
++extern LilvNode *state_uri;
+
+-LilvNode *integer_prop;
+-LilvNode *toggled_prop;
+-LilvNode *designation_pred;
+-LilvNode *in_place_broken_pred;
+-LilvNode *optional_pred;
+-LilvNode *group_pred;
+-LilvNode *supports_event_pred;
+-LilvNode *label_pred;
++extern LilvNode *integer_prop;
++extern LilvNode *toggled_prop;
++extern LilvNode *designation_pred;
++extern LilvNode *in_place_broken_pred;
++extern LilvNode *optional_pred;
++extern LilvNode *group_pred;
++extern LilvNode *supports_event_pred;
++extern LilvNode *label_pred;
+
+-LilvNode *center_role;
+-LilvNode *left_role;
+-LilvNode *right_role;
+-LilvNode *rear_center_role;
+-LilvNode *rear_left_role;
+-LilvNode *rear_right_role;
+-LilvNode *lfe_role;
+-LilvNode *center_left_role;
+-LilvNode *center_right_role;
+-LilvNode *side_left_role;
+-LilvNode *side_right_role;
++extern LilvNode *center_role;
++extern LilvNode *left_role;
++extern LilvNode *right_role;
++extern LilvNode *rear_center_role;
++extern LilvNode *rear_left_role;
++extern LilvNode *rear_right_role;
++extern LilvNode *lfe_role;
++extern LilvNode *center_left_role;
++extern LilvNode *center_right_role;
++extern LilvNode *side_left_role;
++extern LilvNode *side_right_role;
+
+-GstStructure *lv2_meta_all;
++extern GstStructure *lv2_meta_all;
+
+ void gst_lv2_filter_register_element (GstPlugin *plugin,
+ GstStructure * lv2_meta);
+--
+GitLab
+
+