Skip to content

Commit a258b5e

Browse files
authored
[gstreamer] Fix multiple definition of functions (microsoft#42638)
1 parent b322364 commit a258b5e

File tree

5 files changed

+43
-2
lines changed

5 files changed

+43
-2
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/subprojects/gst-plugins-bad/gst/siren/common.c b/subprojects/gst-plugins-bad/gst/siren/common.c
2+
index 2e07748..70f58f6 100644
3+
--- a/subprojects/gst-plugins-bad/gst/siren/common.c
4+
+++ b/subprojects/gst-plugins-bad/gst/siren/common.c
5+
@@ -44,7 +44,7 @@ int max_bin[8] = {
6+
1
7+
};
8+
9+
-float step_size[8] = {
10+
+float stp_size[8] = {
11+
0.3536f,
12+
0.5f,
13+
0.70709997f,
14+
@@ -87,7 +87,7 @@ siren_init (void)
15+
(float) pow (10, (i - 24 + 0.5) * STEPSIZE);
16+
17+
for (i = 0; i < 8; i++)
18+
- step_size_inverse[i] = (float) 1.0 / step_size[i];
19+
+ step_size_inverse[i] = (float) 1.0 / stp_size[i];
20+
21+
siren_dct4_init ();
22+
siren_rmlt_init ();
23+
diff --git a/subprojects/gst-plugins-bad/gst/siren/common.h b/subprojects/gst-plugins-bad/gst/siren/common.h
24+
index e09e533..123b888 100644
25+
--- a/subprojects/gst-plugins-bad/gst/siren/common.h
26+
+++ b/subprojects/gst-plugins-bad/gst/siren/common.h
27+
@@ -95,7 +95,7 @@ extern int vector_dimension[8];
28+
extern int number_of_vectors[8];
29+
extern float dead_zone[8];
30+
extern int max_bin[8];
31+
-extern float step_size[8];
32+
+extern float stp_size[8];
33+
extern float step_size_inverse[8];
34+
35+

ports/gstreamer/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ vcpkg_from_gitlab(
2323
fix-bz2-windows-debug-dependency.patch
2424
no-downloads.patch
2525
${PATCHES}
26+
fix-multiple-def.patch
2627
)
2728

2829
vcpkg_find_acquire_program(FLEX)

ports/gstreamer/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gstreamer",
33
"version": "1.24.7",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "GStreamer open-source multimedia framework core library",
66
"homepage": "https://gstreamer.freedesktop.org/",
77
"license": "LGPL-2.0-only",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3310,7 +3310,7 @@
33103310
},
33113311
"gstreamer": {
33123312
"baseline": "1.24.7",
3313-
"port-version": 1
3313+
"port-version": 2
33143314
},
33153315
"gtest": {
33163316
"baseline": "1.15.2",

versions/g-/gstreamer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "895e28954cc355e23abad8b4babb540f5de2db6b",
5+
"version": "1.24.7",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "018489638670c73b79e737bb3fe4d1e6452697f9",
510
"version": "1.24.7",

0 commit comments

Comments
 (0)