vanhofen
6 years ago
28 changed files with 688 additions and 768 deletions
@ -0,0 +1,33 @@ |
|||
From 54bba228ea52d01fd84941d97be23c03f9862b64 Mon Sep 17 00:00:00 2001 |
|||
From: Carlos Rafael Giani <dv@pseudoterminal.org> |
|||
Date: Sat, 6 Apr 2013 01:22:22 +0200 |
|||
Subject: [PATCH] Disable yasm for libav when --disable-yasm |
|||
|
|||
Upstream-Status: Inappropriate [configuration] |
|||
|
|||
Signed-off-by: Shane Wang <shane.wang@intel.com> |
|||
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> |
|||
---
|
|||
configure.ac | 4 ++++ |
|||
1 file changed, 4 insertions(+) |
|||
|
|||
diff --git a/configure.ac b/configure.ac
|
|||
index 22ede88..ef3c050 100644
|
|||
--- a/configure.ac
|
|||
+++ b/configure.ac
|
|||
@@ -305,6 +305,12 @@ else
|
|||
emblibav_configure_args="$emblibav_configure_args --enable-gpl" |
|||
fi |
|||
|
|||
+ AC_ARG_ENABLE(yasm,
|
|||
+ [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])])
|
|||
+ if test "x$enable_yasm" = "xno"; then
|
|||
+ emblibav_configure_args="$emblibav_configure_args --disable-yasm"
|
|||
+ fi
|
|||
+
|
|||
# if we are cross-compiling, tell libav so |
|||
case $host in |
|||
*android*) |
|||
--
|
|||
1.8.2 |
|||
|
|||
@ -0,0 +1,35 @@ |
|||
From aac5902d3c9cb35c771e760d0e487622aa2e116a Mon Sep 17 00:00:00 2001 |
|||
From: Khem Raj <raj.khem@gmail.com> |
|||
Date: Thu, 20 Apr 2017 10:38:18 -0700 |
|||
Subject: [PATCH] configure: check for armv7ve variant |
|||
|
|||
OE passes -mcpu and -march via cmdline and if |
|||
package tries to detect one of it own then it |
|||
should be compatible otherwise, newer gcc7+ will |
|||
error out |
|||
|
|||
Check for relevant preprocessor macro to determine |
|||
armv7ve architecture |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: Khem Raj <raj.khem@gmail.com> |
|||
---
|
|||
gst-libs/ext/libav/configure | 1 + |
|||
1 file changed, 1 insertion(+) |
|||
|
|||
diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure
|
|||
index 4a5e477..727818e 100755
|
|||
--- a/gst-libs/ext/libav/configure
|
|||
+++ b/gst-libs/ext/libav/configure
|
|||
@@ -4659,6 +4659,7 @@
|
|||
elif check_arm_arch 6KZ; then echo armv6zk |
|||
elif check_arm_arch 6ZK; then echo armv6zk |
|||
elif check_arm_arch 6T2; then echo armv6t2 |
|||
+ elif check_arm_arch EXT_IDIV; then echo armv7ve
|
|||
elif check_arm_arch 7; then echo armv7 |
|||
elif check_arm_arch 7A 7_A; then echo armv7-a |
|||
elif check_arm_arch 7S; then echo armv7-a |
|||
--
|
|||
2.12.2 |
|||
|
|||
@ -0,0 +1,32 @@ |
|||
It will add -mips64r6 and -mips64r2 to cmdline which will |
|||
cause conflicts |
|||
|
|||
in OE we user mips32r2 and mips64r2 for mips arch versions |
|||
so there is no benefit of detecting it automatically by |
|||
poking at tools especially in cross env |
|||
|
|||
Fixes errors like |
|||
|
|||
linking -mnan=2008 module with previous -mnan=legacy modules |
|||
failed to merge target specific data of file |
|||
|
|||
-Khem
|
|||
Upstream-Status: Inappropriate [OE-Specific] |
|||
|
|||
Index: gst-libav-1.10.1/gst-libs/ext/libav/configure
|
|||
===================================================================
|
|||
--- gst-libav-1.10.1.orig/gst-libs/ext/libav/configure
|
|||
+++ gst-libav-1.10.1/gst-libs/ext/libav/configure
|
|||
@@ -5269,12 +5269,9 @@ elif enabled mips; then
|
|||
|
|||
# Enable minimum ISA based on selected options |
|||
if enabled mips64; then |
|||
- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
|
|||
enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' |
|||
disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' |
|||
else |
|||
- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
|
|||
- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
|
|||
enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' |
|||
disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' |
|||
fi |
|||
@ -0,0 +1,26 @@ |
|||
Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset |
|||
Author: Bernhard Übelacker <bernhardu@vr-web.de> |
|||
|
|||
---
|
|||
Bug-Debian: https://bugs.debian.org/783082 |
|||
Last-Update: 2015-04-28 |
|||
|
|||
Upstream-Status: Backport [debian] |
|||
|
|||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
|||
|
|||
--- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c
|
|||
+++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c
|
|||
@@ -2020,7 +2020,11 @@ decode_intra_mb:
|
|||
// In deblocking, the quantizer is 0 |
|||
h->cur_pic.qscale_table[mb_xy] = 0; |
|||
// All coeffs are present |
|||
- memset(h->non_zero_count[mb_xy], 16, 48);
|
|||
+ /*memset(h->non_zero_count[mb_xy], 16, 48);*/
|
|||
+ /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */
|
|||
+ for (size_t i = 0; i < 48; i++) {
|
|||
+ ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
|
|||
+ }
|
|||
h->cur_pic.mb_type[mb_xy] = mb_type; |
|||
sl->last_qscale_diff = 0; |
|||
return 0; |
|||
@ -1,71 +0,0 @@ |
|||
From ae7f7f6f53a264cabe324a3810599a66b357d3f2 Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Sat, 19 Nov 2016 11:07:55 +0100 |
|||
Subject: [PATCH] [PATCH] Makefile.am: don't hardcode libtool name when running |
|||
introspection tools |
|||
|
|||
Upstream-Status: Pending [review on oe-core list] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
|
|||
modified: gst-libs/gst/gl/Makefile.am |
|||
modified: gst-libs/gst/insertbin/Makefile.am |
|||
modified: gst-libs/gst/mpegts/Makefile.am |
|||
---
|
|||
gst-libs/gst/gl/Makefile.am | 2 +- |
|||
gst-libs/gst/insertbin/Makefile.am | 2 +- |
|||
gst-libs/gst/mpegts/Makefile.am | 2 +- |
|||
3 files changed, 3 insertions(+), 3 deletions(-) |
|||
|
|||
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
|
|||
index 68cc619..1ff5511 100644
|
|||
--- a/gst-libs/gst/gl/Makefile.am
|
|||
+++ b/gst-libs/gst/gl/Makefile.am
|
|||
@@ -172,7 +172,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
|
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
--include=GstVideo-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-video-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
|
|||
index 1f8ea30..4b98ef6 100644
|
|||
--- a/gst-libs/gst/insertbin/Makefile.am
|
|||
+++ b/gst-libs/gst/insertbin/Makefile.am
|
|||
@@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
|
|||
--library=libgstinsertbin-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
|
|||
index aeea32e..929d9cc 100644
|
|||
--- a/gst-libs/gst/mpegts/Makefile.am
|
|||
+++ b/gst-libs/gst/mpegts/Makefile.am
|
|||
@@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
|
|||
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ |
|||
--library=libgstmpegts-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-video-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ |
|||
--
|
|||
2.7.4 |
|||
|
|||
--- a/gst-libs/gst/allocators/Makefile.am 2017-06-06 13:34:13.206127663 +0200
|
|||
+++ b/gst-libs/gst/allocators/Makefile.am 2017-06-06 13:34:44.395382923 +0200
|
|||
@@ -37,7 +37,7 @@
|
|||
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
|||
--library=libgstbadallocators-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-badallocators-@GST_API_VERSION@ \ |
|||
--output $@ \ |
|||
@ -1,12 +0,0 @@ |
|||
--- a/sys/dvb/gstdvbsrc.c 2016-12-16 21:52:42.691458624 +0100
|
|||
+++ b/sys/dvb/gstdvbsrc.c 2016-12-16 21:54:05.192216253 +0100
|
|||
@@ -306,7 +306,9 @@
|
|||
{APSK_16, "16APSK", "16apsk"}, |
|||
{APSK_32, "32APSK", "32apsk"}, |
|||
{DQPSK, "DQPSK", "dqpsk"}, |
|||
+#if HAVE_V5_MINOR(7)
|
|||
{QAM_4_NR, "QAM 4 NR", "qam-4-nr"}, |
|||
+#endif
|
|||
{0, NULL, NULL}, |
|||
}; |
|||
|
|||
@ -1,36 +0,0 @@ |
|||
From cb42f72318e284519cf155292f948a93383c09c6 Mon Sep 17 00:00:00 2001 |
|||
From: christophecvr <stefansat@telenet.be> |
|||
Date: Fri, 24 Feb 2017 14:34:33 +0100 |
|||
Subject: [PATCH] Try-out continu in hls to avoid blocking of main thread. |
|||
|
|||
Looks like the error self was false, |
|||
If we just continue it retries,and |
|||
the media just continues to play ok. |
|||
The main advantage is that we avoid a |
|||
main e2 thread blocked with stb freeze |
|||
as result. Even if the media would stop, |
|||
We do not have a frozen stb. |
|||
|
|||
modified: ext/hls/m3u8.c |
|||
---
|
|||
ext/hls/m3u8.c | 4 ++-- |
|||
1 file changed, 2 insertions(+), 2 deletions(-) |
|||
|
|||
diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
|
|||
index e85592e..5feef75 100644
|
|||
--- a/ext/hls/m3u8.c
|
|||
+++ b/ext/hls/m3u8.c
|
|||
@@ -365,8 +365,8 @@ gst_m3u8_update_check_consistent_media_seqnums (GstM3U8 * self,
|
|||
} |
|||
} else if (g_str_equal (f1->uri, f2->uri)) { |
|||
/* Same URIs but different sequences, this is bad! */ |
|||
- GST_ERROR ("Media sequences inconsistent, ignoring");
|
|||
- return FALSE;
|
|||
+ GST_ERROR ("Media sequences inconsistent, ignoring, but try anyway");
|
|||
+ //return FALSE;
|
|||
} else { |
|||
/* Not same URI, not same sequence but by construction sequence |
|||
* must be higher in the new one. All good in that case, if it |
|||
--
|
|||
2.7.4 |
|||
|
|||
@ -1,7 +1,16 @@ |
|||
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.cindex bd196c3..1f29ef0 100644
|
|||
From c496fdd9874261f29ae485e2907c3f838c95a1d3 Mon Sep 17 00:00:00 2001 |
|||
From: captain <openatv@gmail.com> |
|||
Date: Mon, 5 Dec 2016 11:52:55 +0100 |
|||
|
|||
---
|
|||
gst/mpegtsdemux/tsdemux.c | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
|
|||
index b0ff238..b7b423e 100644
|
|||
--- a/gst/mpegtsdemux/tsdemux.c
|
|||
+++ b/gst/mpegtsdemux/tsdemux.c
|
|||
@@ -1634,7 +1634,7 @@ gst_ts_demux_stream_added (MpegTSBase * base, MpegTSBaseStream * bstream,
|
|||
@@ -1761,7 +1761,7 @@ gst_ts_demux_stream_added (MpegTSBase * base, MpegTSBaseStream * bstream,
|
|||
stream->first_pts = GST_CLOCK_TIME_NONE; |
|||
stream->raw_pts = -1; |
|||
stream->raw_dts = -1; |
|||
@ -0,0 +1,28 @@ |
|||
From ee46a56bcf94e9dbfed76d5682597491f4a69a54 Mon Sep 17 00:00:00 2001 |
|||
From: Andre McCurdy <armccurdy@gmail.com> |
|||
Date: Wed, 3 Feb 2016 18:05:41 -0800 |
|||
Subject: [PATCH] avoid including <sys/poll.h> directly |
|||
|
|||
musl libc generates warnings if <sys/poll.h> is included directly. |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
|||
|
|||
---
|
|||
sys/dvb/gstdvbsrc.c | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
|
|||
index d9bee26..2edd9fa 100644
|
|||
--- a/sys/dvb/gstdvbsrc.c
|
|||
+++ b/sys/dvb/gstdvbsrc.c
|
|||
@@ -97,7 +97,7 @@
|
|||
#include <gst/gst.h> |
|||
#include <gst/glib-compat-private.h> |
|||
#include <sys/ioctl.h> |
|||
-#include <sys/poll.h>
|
|||
+#include <poll.h>
|
|||
#include <fcntl.h> |
|||
#include <errno.h> |
|||
#include <stdio.h> |
|||
@ -0,0 +1,22 @@ |
|||
From 344b6a92bb2138d81be002dd8846979a5f648ada Mon Sep 17 00:00:00 2001 |
|||
From: Captain <captain.onboard@web.de> |
|||
Date: Sat, 24 Dec 2016 21:48:54 +0100 |
|||
|
|||
---
|
|||
sys/dvb/gstdvbsrc.c | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
|
|||
index 2edd9fa..0b38c8b 100644
|
|||
--- a/sys/dvb/gstdvbsrc.c
|
|||
+++ b/sys/dvb/gstdvbsrc.c
|
|||
@@ -306,7 +306,9 @@ gst_dvbsrc_modulation_get_type (void)
|
|||
{APSK_16, "16APSK", "16apsk"}, |
|||
{APSK_32, "32APSK", "32apsk"}, |
|||
{DQPSK, "DQPSK", "dqpsk"}, |
|||
+#if HAVE_V5_MINOR(7)
|
|||
{QAM_4_NR, "QAM 4 NR", "qam-4-nr"}, |
|||
+#endif
|
|||
{0, NULL, NULL}, |
|||
}; |
|||
|
|||
@ -0,0 +1,86 @@ |
|||
From fcd806e86763f00934a76829a28c36d9f85aa144 Mon Sep 17 00:00:00 2001 |
|||
From: Andre McCurdy <armccurdy@gmail.com> |
|||
Date: Tue, 9 Feb 2016 14:00:00 -0800 |
|||
Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc |
|||
|
|||
For GStreamer functions declared with G_GNUC_NULL_TERMINATED, |
|||
ie __attribute__((__sentinel__)), gcc will generate a warning if the |
|||
last parameter passed to the function is not NULL (where a valid NULL |
|||
in this context is defined as zero with any pointer type). |
|||
|
|||
The C callers to such functions within gst-plugins-bad use the C NULL |
|||
definition (ie ((void*)0)), which is a valid sentinel. |
|||
|
|||
However the C++ NULL definition (ie 0L), is not a valid sentinel |
|||
without an explicit cast to a pointer type. |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
|||
|
|||
---
|
|||
sys/decklink/gstdecklink.cpp | 10 +++++----- |
|||
sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- |
|||
sys/decklink/gstdecklinkvideosink.cpp | 2 +- |
|||
3 files changed, 7 insertions(+), 7 deletions(-) |
|||
|
|||
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
|
|||
index e1f91ba..94b0a24 100644
|
|||
--- a/sys/decklink/gstdecklink.cpp
|
|||
+++ b/sys/decklink/gstdecklink.cpp
|
|||
@@ -548,7 +548,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
|
|||
"pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, |
|||
"interlace-mode", G_TYPE_STRING, |
|||
mode->interlaced ? "interleaved" : "progressive", |
|||
- "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL);
|
|||
+ "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL);
|
|||
|
|||
if (input && mode->interlaced) { |
|||
if (mode->tff) |
|||
@@ -563,16 +563,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
|
|||
case bmdFormat8BitYUV: /* '2vuy' */ |
|||
gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", |
|||
"colorimetry", G_TYPE_STRING, mode->colorimetry, |
|||
- "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
|
|||
+ "chroma-site", G_TYPE_STRING, "mpeg2", (void*)NULL);
|
|||
break; |
|||
case bmdFormat10BitYUV: /* 'v210' */ |
|||
- gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL);
|
|||
+ gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void*)NULL);
|
|||
break; |
|||
case bmdFormat8BitARGB: /* 'ARGB' */ |
|||
- gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL);
|
|||
+ gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void*)NULL);
|
|||
break; |
|||
case bmdFormat8BitBGRA: /* 'BGRA' */ |
|||
- gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL);
|
|||
+ gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void*)NULL);
|
|||
break; |
|||
case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ |
|||
case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ |
|||
diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
|
|||
index 3abbc50..c71723e 100644
|
|||
--- a/sys/decklink/gstdecklinkaudiosrc.cpp
|
|||
+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
|
|||
@@ -369,7 +369,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
|
|||
g_mutex_unlock (&self->input->lock); |
|||
|
|||
if (videosrc) { |
|||
- g_object_get (videosrc, "connection", &vconn, NULL);
|
|||
+ g_object_get (videosrc, "connection", &vconn, (void *) NULL);
|
|||
gst_object_unref (videosrc); |
|||
|
|||
switch (vconn) { |
|||
diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
|
|||
index cf8b42c..afc6095 100644
|
|||
--- a/sys/decklink/gstdecklinkvideosink.cpp
|
|||
+++ b/sys/decklink/gstdecklinkvideosink.cpp
|
|||
@@ -172,7 +172,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
|
|||
gpointer user_data) |
|||
{ |
|||
gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, |
|||
- G_MAXINT, 1, NULL);
|
|||
+ G_MAXINT, 1, (void *) NULL);
|
|||
|
|||
return TRUE; |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
From e141dcb746aabfa268884557b4544e4bfcde0e15 Mon Sep 17 00:00:00 2001 |
|||
From: christophecvr <stefansat@telenet.be> |
|||
Date: Fri, 24 Feb 2017 14:34:33 +0100 |
|||
Subject: [PATCH] Try-out continu in hls to avoid blocking of main thread. |
|||
|
|||
Looks like the error self was false, |
|||
If we just continue it retries,and |
|||
the media just continues to play ok. |
|||
The main advantage is that we avoid a |
|||
main e2 thread blocked with stb freeze |
|||
as result. Even if the media would stop, |
|||
We do not have a frozen stb. |
|||
|
|||
modified: ext/hls/m3u8.c |
|||
|
|||
---
|
|||
ext/hls/m3u8.c | 4 ++-- |
|||
1 file changed, 2 insertions(+), 2 deletions(-) |
|||
|
|||
diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
|
|||
index 594a963..74f3fd6 100644
|
|||
--- a/ext/hls/m3u8.c
|
|||
+++ b/ext/hls/m3u8.c
|
|||
@@ -358,9 +358,9 @@ check_media_seqnums (GstM3U8 * self, GList * previous_files)
|
|||
|
|||
if (f1->sequence == f2->sequence && !g_str_equal (f1->uri, f2->uri)) { |
|||
/* Same sequence, different URI. This is bad! */ |
|||
- GST_ERROR ("Media URIs inconsistent (sequence %" G_GINT64_FORMAT
|
|||
+ GST_ERROR ("Media URIs inconsistent, but try anyway (sequence %" G_GINT64_FORMAT
|
|||
"): had '%s', got '%s'", f1->sequence, f2->uri, f1->uri); |
|||
- return FALSE;
|
|||
+ //return FALSE;
|
|||
} else if (f1->sequence < f2->sequence) { |
|||
/* Not same sequence but by construction sequence must be higher in the |
|||
* new one. All good in that case, if it isn't then this means that |
|||
@ -1,180 +0,0 @@ |
|||
From 0c5843296bece8c298d5c8ca7342835f9fa9cbd6 Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Sat, 19 Nov 2016 10:26:10 +0100 |
|||
Subject: [PATCH] [PATCH 1/4] Makefile.am: don't hardcode libtool name when |
|||
running introspection tools |
|||
|
|||
Upstream-Status: Pending [review on oe-core maillist] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
|
|||
modified: gst-libs/gst/allocators/Makefile.am |
|||
modified: gst-libs/gst/app/Makefile.am |
|||
modified: gst-libs/gst/audio/Makefile.am |
|||
modified: gst-libs/gst/fft/Makefile.am |
|||
modified: gst-libs/gst/pbutils/Makefile.am |
|||
modified: gst-libs/gst/riff/Makefile.am |
|||
modified: gst-libs/gst/rtp/Makefile.am |
|||
modified: gst-libs/gst/rtsp/Makefile.am |
|||
modified: gst-libs/gst/sdp/Makefile.am |
|||
modified: gst-libs/gst/tag/Makefile.am |
|||
modified: gst-libs/gst/video/Makefile.am |
|||
---
|
|||
gst-libs/gst/allocators/Makefile.am | 2 +- |
|||
gst-libs/gst/app/Makefile.am | 2 +- |
|||
gst-libs/gst/audio/Makefile.am | 2 +- |
|||
gst-libs/gst/fft/Makefile.am | 2 +- |
|||
gst-libs/gst/pbutils/Makefile.am | 2 +- |
|||
gst-libs/gst/riff/Makefile.am | 2 +- |
|||
gst-libs/gst/rtp/Makefile.am | 2 +- |
|||
gst-libs/gst/rtsp/Makefile.am | 2 +- |
|||
gst-libs/gst/sdp/Makefile.am | 2 +- |
|||
gst-libs/gst/tag/Makefile.am | 2 +- |
|||
gst-libs/gst/video/Makefile.am | 2 +- |
|||
11 files changed, 11 insertions(+), 11 deletions(-) |
|||
|
|||
diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
|
|||
index bccfdb3..c3a1cb8 100644
|
|||
--- a/gst-libs/gst/allocators/Makefile.am
|
|||
+++ b/gst-libs/gst/allocators/Makefile.am
|
|||
@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
|
|||
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
|||
--library=libgstallocators-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-allocators-@GST_API_VERSION@ \ |
|||
--output $@ \ |
|||
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
|
|||
index 0033371..1869540 100644
|
|||
--- a/gst-libs/gst/app/Makefile.am
|
|||
+++ b/gst-libs/gst/app/Makefile.am
|
|||
@@ -42,7 +42,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
|
|||
--library=libgstapp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-app-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
|
|||
index 41f9c4d..c39c529 100644
|
|||
--- a/gst-libs/gst/audio/Makefile.am
|
|||
+++ b/gst-libs/gst/audio/Makefile.am
|
|||
@@ -174,7 +174,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
|
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
--include=GstTag-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-audio-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
|
|||
index 0d70422..2ded9ee 100644
|
|||
--- a/gst-libs/gst/fft/Makefile.am
|
|||
+++ b/gst-libs/gst/fft/Makefile.am
|
|||
@@ -66,7 +66,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
|
|||
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
|||
--library=libgstfft-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-fft-@GST_API_VERSION@ \ |
|||
--output $@ \ |
|||
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
|
|||
index c5a25ca..44be19b 100644
|
|||
--- a/gst-libs/gst/pbutils/Makefile.am
|
|||
+++ b/gst-libs/gst/pbutils/Makefile.am
|
|||
@@ -100,7 +100,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
|
|||
--include=GstTag-@GST_API_VERSION@ \ |
|||
--include=GstVideo-@GST_API_VERSION@ \ |
|||
--include=GstAudio-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-tag-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-video-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
|
|||
index 5fa26e5..1cf0590 100644
|
|||
--- a/gst-libs/gst/riff/Makefile.am
|
|||
+++ b/gst-libs/gst/riff/Makefile.am
|
|||
@@ -48,7 +48,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
|
|||
# --include=GstAudio-@GST_API_VERSION@ \ |
|||
# --include=GstTag-@GST_API_VERSION@ \ |
|||
# --include=Gst-@GST_API_VERSION@ \ |
|||
-# --libtool="$(top_builddir)/libtool" \
|
|||
+# --libtool="$(LIBTOOL)" \
|
|||
# --pkg gstreamer-@GST_API_VERSION@ \ |
|||
# --pkg gstreamer-tag-@GST_API_VERSION@ \ |
|||
# --pkg gstreamer-audio-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
|
|||
index 04b1f90..85085dc 100644
|
|||
--- a/gst-libs/gst/rtp/Makefile.am
|
|||
+++ b/gst-libs/gst/rtp/Makefile.am
|
|||
@@ -66,7 +66,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
|
|||
--library=libgstrtp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-rtp-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
|
|||
index 88f0853..92b5e81 100644
|
|||
--- a/gst-libs/gst/rtsp/Makefile.am
|
|||
+++ b/gst-libs/gst/rtsp/Makefile.am
|
|||
@@ -73,7 +73,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
|
|||
--include=Gio-2.0 \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstSdp-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gio-2.0 \ |
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-sdp-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
|
|||
index 6fd9693..e356b16 100644
|
|||
--- a/gst-libs/gst/sdp/Makefile.am
|
|||
+++ b/gst-libs/gst/sdp/Makefile.am
|
|||
@@ -33,7 +33,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
|
|||
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
|||
--library=libgstsdp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-sdp-@GST_API_VERSION@ \ |
|||
--output $@ \ |
|||
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
|
|||
index c0c2d6b..490ed40 100644
|
|||
--- a/gst-libs/gst/tag/Makefile.am
|
|||
+++ b/gst-libs/gst/tag/Makefile.am
|
|||
@@ -46,7 +46,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
|
|||
--library=libgsttag-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-tag-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
|
|||
index 64f4978..f3ea4ea 100644
|
|||
--- a/gst-libs/gst/video/Makefile.am
|
|||
+++ b/gst-libs/gst/video/Makefile.am
|
|||
@@ -121,7 +121,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
|
|||
--library=libgstvideo-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
- --libtool="$(top_builddir)/libtool" \
|
|||
+ --libtool="$(LIBTOOL)" \
|
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
--pkg-export gstreamer-video-@GST_API_VERSION@ \ |
|||
--
|
|||
2.7.4 |
|||
|
|||
@ -1,298 +0,0 @@ |
|||
From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Mon, 26 Oct 2015 16:38:18 +0200 |
|||
Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with |
|||
PKG_CONFIG_SYSROOT_DIR |
|||
|
|||
Upstream-Status: Pending [review on oe-core maillist] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
---
|
|||
gst-libs/gst/allocators/Makefile.am | 4 ++-- |
|||
gst-libs/gst/app/Makefile.am | 4 ++-- |
|||
gst-libs/gst/audio/Makefile.am | 12 ++++++------ |
|||
gst-libs/gst/fft/Makefile.am | 4 ++-- |
|||
gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ |
|||
gst-libs/gst/riff/Makefile.am | 8 ++++---- |
|||
gst-libs/gst/rtp/Makefile.am | 8 ++++---- |
|||
gst-libs/gst/rtsp/Makefile.am | 4 ++-- |
|||
gst-libs/gst/sdp/Makefile.am | 4 ++-- |
|||
gst-libs/gst/tag/Makefile.am | 8 ++++---- |
|||
gst-libs/gst/video/Makefile.am | 8 ++++---- |
|||
11 files changed, 38 insertions(+), 38 deletions(-) |
|||
|
|||
diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
|
|||
index bc7f53a..0ef5f86 100644
|
|||
--- a/gst-libs/gst/allocators/Makefile.am
|
|||
+++ b/gst-libs/gst/allocators/Makefile.am
|
|||
@@ -34,7 +34,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
|
|||
--c-include "gst/allocators/allocators.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
--library=libgstallocators-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--libtool="$(LIBTOOL)" \ |
|||
@@ -58,7 +58,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
|
|||
index dcc2fe0..dc076cb 100644
|
|||
--- a/gst-libs/gst/app/Makefile.am
|
|||
+++ b/gst-libs/gst/app/Makefile.am
|
|||
@@ -47,8 +47,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
|
|||
--c-include "gst/app/app.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library=libgstapp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
|
|||
index 2374196..295eb42 100644
|
|||
--- a/gst-libs/gst/audio/Makefile.am
|
|||
+++ b/gst-libs/gst/audio/Makefile.am
|
|||
@@ -96,12 +96,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
|
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
--c-include "gst/audio/audio.h" \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
--library=libgstaudio-@GST_API_VERSION@.la \ |
|||
- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
|||
- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library-path="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
@@ -130,8 +130,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
--includedir="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
|
|||
index f545354..1bb6243 100644
|
|||
--- a/gst-libs/gst/fft/Makefile.am
|
|||
+++ b/gst-libs/gst/fft/Makefile.am
|
|||
@@ -61,7 +61,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
|
|||
--c-include "gst/fft/fft.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
--library=libgstfft-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--libtool="$(LIBTOOL)" \ |
|||
@@ -85,7 +85,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
|
|||
index 91dc214..dc8e1d3 100644
|
|||
--- a/gst-libs/gst/pbutils/Makefile.am
|
|||
+++ b/gst-libs/gst/pbutils/Makefile.am
|
|||
@@ -79,14 +79,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
|
|||
--c-include "gst/pbutils/pbutils.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
--add-include-path="$(top_builddir)/gst-libs/gst/video/" \ |
|||
--add-include-path="$(top_builddir)/gst-libs/gst/audio/" \ |
|||
--library=libgstpbutils-@GST_API_VERSION@.la \ |
|||
- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
|||
- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library-path="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
--library-path="$(top_builddir)/gst-libs/gst/video/" \ |
|||
--library-path="$(top_builddir)/gst-libs/gst/audio/" \ |
|||
@@ -119,8 +119,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--includedir="$(top_builddir)/gst-libs/gst/tag/" \ |
|||
--includedir="$(top_builddir)/gst-libs/gst/video/" \ |
|||
--includedir="$(top_builddir)/gst-libs/gst/audio/" \ |
|||
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
|
|||
index 3bd8fc0..0a115cc 100644
|
|||
--- a/gst-libs/gst/riff/Makefile.am
|
|||
+++ b/gst-libs/gst/riff/Makefile.am
|
|||
@@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
|
|||
# --c-include "gst/riff/riff.h" \ |
|||
# --add-include-path=$(builddir)/../tag \ |
|||
# --add-include-path=$(builddir)/../audio \ |
|||
-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
# --library=libgstriff-@GST_API_VERSION@.la \ |
|||
# --include=GstAudio-@GST_API_VERSION@ \ |
|||
# --include=GstTag-@GST_API_VERSION@ \ |
|||
@@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
|
|||
# --includedir=$(builddir) \ |
|||
# --includedir=$(builddir)/../tag \ |
|||
# --includedir=$(builddir)/../audio \ |
|||
-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
# $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
# |
|||
#CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
|
|||
index f5445c1..527c0b4 100644
|
|||
--- a/gst-libs/gst/rtp/Makefile.am
|
|||
+++ b/gst-libs/gst/rtp/Makefile.am
|
|||
@@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
|
|||
--c-include "gst/rtp/rtp.h" \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library=libgstrtp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
|
|||
index 9b0b258..4f6d9f8 100644
|
|||
--- a/gst-libs/gst/rtsp/Makefile.am
|
|||
+++ b/gst-libs/gst/rtsp/Makefile.am
|
|||
@@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
|
|||
-I$(top_builddir)/gst-libs \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
--add-include-path=$(builddir)/../sdp \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
--library=libgstrtsp-@GST_API_VERSION@.la \ |
|||
--include=Gio-2.0 \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
@@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
--includedir=$(builddir)/../sdp \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
|
|||
index 0e149b8..9aa0512 100644
|
|||
--- a/gst-libs/gst/sdp/Makefile.am
|
|||
+++ b/gst-libs/gst/sdp/Makefile.am
|
|||
@@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
|
|||
--warn-all \ |
|||
--c-include "gst/sdp/sdp.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
--library=libgstsdp-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--libtool="$(LIBTOOL)" \ |
|||
@@ -52,7 +52,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
|
|||
index cafafd3..ba99279 100644
|
|||
--- a/gst-libs/gst/tag/Makefile.am
|
|||
+++ b/gst-libs/gst/tag/Makefile.am
|
|||
@@ -39,8 +39,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
|
|||
--c-include "gst/tag/tag.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library=libgsttag-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
@@ -67,8 +67,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
|
|||
index ac64eb3..342c8c6 100644
|
|||
--- a/gst-libs/gst/video/Makefile.am
|
|||
+++ b/gst-libs/gst/video/Makefile.am
|
|||
@@ -108,8 +108,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
|
|||
--c-include "gst/video/video.h" \ |
|||
-I$(top_srcdir)/gst-libs \ |
|||
-I$(top_builddir)/gst-libs \ |
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
--library=libgstvideo-@GST_API_VERSION@.la \ |
|||
--include=Gst-@GST_API_VERSION@ \ |
|||
--include=GstBase-@GST_API_VERSION@ \ |
|||
@@ -136,8 +136,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(INTROSPECTION_COMPILER) \ |
|||
--includedir=$(srcdir) \ |
|||
--includedir=$(builddir) \ |
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|||
+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
|||
|
|||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
|||
--
|
|||
2.6.2 |
|||
|
|||
@ -1,66 +0,0 @@ |
|||
From cc5681e3d07023e8684c5da962c4fb5fcecfd385 Mon Sep 17 00:00:00 2001 |
|||
From: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com> |
|||
Date: Fri, 28 Nov 2014 13:26:13 -0300 |
|||
Subject: [PATCH] subparse: avoid false negatives dealing with UTF-8 |
|||
|
|||
g_utf8_validate() chokes at any NUL among max_len |
|||
bytes so we should avoid passing null character |
|||
terminators if present. Additionally, only part of |
|||
the available data might be valid UTF-8. For example |
|||
a byte at the end might be the start of a valid UTF-8 |
|||
run (ie: d0) but not be a valid UTF-8 character by |
|||
itself. In this case, we consume only the valid portion |
|||
of the run. |
|||
|
|||
https://bugzilla.gnome.org/show_bug.cgi?id=740784 |
|||
---
|
|||
gst/subparse/gstsubparse.c | 23 +++++++++++++++++++++-- |
|||
1 file changed, 21 insertions(+), 2 deletions(-) |
|||
|
|||
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
|
|||
index 11b76c3..2719fd7 100644
|
|||
--- a/gst/subparse/gstsubparse.c
|
|||
+++ b/gst/subparse/gstsubparse.c
|
|||
@@ -437,6 +437,9 @@ convert_encoding (GstSubParse * self, const gchar * str, gsize len,
|
|||
const gchar *encoding; |
|||
GError *err = NULL; |
|||
gchar *ret = NULL; |
|||
+ gsize nuls = 0;
|
|||
+ gsize valid_utf8_len;
|
|||
+ const gchar *invalid_utf8_start;
|
|||
|
|||
*consumed = 0; |
|||
|
|||
@@ -457,11 +460,27 @@ convert_encoding (GstSubParse * self, const gchar * str, gsize len,
|
|||
|
|||
/* Otherwise check if it's UTF8 */ |
|||
if (self->valid_utf8) { |
|||
- if (g_utf8_validate (str, len, NULL)) {
|
|||
+ /* Trim NUL terminator(s) if present */
|
|||
+ while (len > 0 && str[len - 1] == '\0') {
|
|||
+ len--;
|
|||
+ nuls++;
|
|||
+ }
|
|||
+
|
|||
+ /* Consume whole byte run if all valid UTF-8 */
|
|||
+ if (g_utf8_validate (str, len, &invalid_utf8_start)) {
|
|||
GST_LOG_OBJECT (self, "valid UTF-8, no conversion needed"); |
|||
- *consumed = len;
|
|||
+ *consumed = len + nuls;
|
|||
return g_strndup (str, len); |
|||
} |
|||
+
|
|||
+ /* Consume initial data as far as we have at least 1 valid code point */
|
|||
+ valid_utf8_len = invalid_utf8_start - str;
|
|||
+ if (valid_utf8_len) {
|
|||
+ GST_WARNING_OBJECT (self, "At least some of the data was invalid UTF-8");
|
|||
+ *consumed = valid_utf8_len;
|
|||
+ return g_strndup (str, valid_utf8_len);
|
|||
+ }
|
|||
+
|
|||
GST_INFO_OBJECT (self, "invalid UTF-8!"); |
|||
self->valid_utf8 = FALSE; |
|||
} |
|||
--
|
|||
2.1.4 |
|||
|
|||
@ -0,0 +1,26 @@ |
|||
From 7bcc1bccc916edd3901365ff7ebfb6f9f23a51db Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Mon, 26 Oct 2015 17:29:37 +0200 |
|||
Subject: [PATCH] riff: add missing include directories when calling |
|||
introspection scanner |
|||
|
|||
Upstream-Status: Pending [review on oe-core maillist] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
|
|||
---
|
|||
gst-libs/gst/riff/Makefile.am | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
|
|||
index c8c588a..c096453 100644
|
|||
--- a/gst-libs/gst/riff/Makefile.am
|
|||
+++ b/gst-libs/gst/riff/Makefile.am
|
|||
@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
|
|||
# --strip-prefix=Gst \ |
|||
# --warn-all \ |
|||
# --c-include "gst/riff/riff.h" \ |
|||
+# -I$(top_srcdir)/gst-libs \
|
|||
+# -I$(top_builddir)/gst-libs \
|
|||
# --add-include-path=$(builddir)/../tag \ |
|||
# --add-include-path=$(builddir)/../audio \ |
|||
# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
|||
@ -1,27 +1,28 @@ |
|||
From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 |
|||
From 130d150007d12fea7a7f0888b1dcc525bd325fd3 Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Mon, 26 Oct 2015 17:30:14 +0200 |
|||
Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in |
|||
Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in |
|||
Makefile.am |
|||
|
|||
Upstream-Status: Pending [review on oe-core maillist] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
|
|||
---
|
|||
gst-libs/gst/rtsp/Makefile.am | 1 - |
|||
1 file changed, 1 deletion(-) |
|||
|
|||
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
|
|||
index 4f6d9f8..0afa370 100644
|
|||
index 9fc5558ce..8db79eceb 100644
|
|||
--- a/gst-libs/gst/rtsp/Makefile.am
|
|||
+++ b/gst-libs/gst/rtsp/Makefile.am
|
|||
@@ -74,7 +74,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
|
|||
--libtool="$(LIBTOOL)" \ |
|||
@@ -82,7 +82,6 @@
|
|||
--pkg gio-2.0 \ |
|||
--pkg gstreamer-@GST_API_VERSION@ \ |
|||
--pkg gstreamer-base-@GST_API_VERSION@ \ |
|||
- --pkg gstreamer-sdp-@GST_API_VERSION@ \
|
|||
--pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ |
|||
--add-init-section="$(INTROSPECTION_INIT)" \ |
|||
--output $@ \ |
|||
--
|
|||
2.6.2 |
|||
2.17.1.windows.2 |
|||
|
|||
@ -0,0 +1,73 @@ |
|||
From 8a2404f78282bdbc16e8f0afac10cf83f24517ba Mon Sep 17 00:00:00 2001 |
|||
From: Mingke Wang <mingke.wang@freescale.com> |
|||
Date: Thu, 19 Mar 2015 14:20:26 +0800 |
|||
Subject: [PATCH] subparse: set need_segment after sink pad received |
|||
GST_EVENT_SEGMENT |
|||
|
|||
subparse works in push mode, chain funciton will be called once |
|||
up stream element finished the seeking and flushing. |
|||
if set need_segment flag in src pad event handler, the segment |
|||
event will be pushed earlier, result in the subtitle text will |
|||
be send out to down stream from the beginning. |
|||
|
|||
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747498] |
|||
|
|||
Signed-off-by: Mingke Wang <mingke.wang@freescale.com> |
|||
|
|||
---
|
|||
gst/subparse/gstsubparse.c | 26 ++++++++++++-------------- |
|||
1 file changed, 12 insertions(+), 14 deletions(-) |
|||
mode change 100644 => 100755 gst/subparse/gstsubparse.c |
|||
|
|||
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
|
|||
old mode 100644 |
|||
new mode 100755 |
|||
index cf29a56..98c43fc
|
|||
--- a/gst/subparse/gstsubparse.c
|
|||
+++ b/gst/subparse/gstsubparse.c
|
|||
@@ -270,24 +270,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
|||
goto beach; |
|||
} |
|||
|
|||
+ /* Apply the seek to our segment */
|
|||
+ gst_segment_do_seek (&self->segment, rate, format, flags,
|
|||
+ start_type, start, stop_type, stop, &update);
|
|||
+
|
|||
+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
|
|||
+ &self->segment);
|
|||
+
|
|||
/* Convert that seek to a seeking in bytes at position 0, |
|||
FIXME: could use an index */ |
|||
ret = gst_pad_push_event (self->sinkpad, |
|||
gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, |
|||
GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); |
|||
|
|||
- if (ret) {
|
|||
- /* Apply the seek to our segment */
|
|||
- gst_segment_do_seek (&self->segment, rate, format, flags,
|
|||
- start_type, start, stop_type, stop, &update);
|
|||
-
|
|||
- GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
|
|||
- &self->segment);
|
|||
-
|
|||
- /* will mark need_segment when receiving segment from upstream,
|
|||
- * after FLUSH and all that has happened,
|
|||
- * rather than racing with chain */
|
|||
- } else {
|
|||
+ if (!ret) {
|
|||
GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); |
|||
} |
|||
|
|||
@@ -1877,8 +1869,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
|||
gst_event_parse_segment (event, &s); |
|||
if (s->format == GST_FORMAT_TIME) |
|||
gst_event_copy_segment (event, &self->segment); |
|||
- GST_DEBUG_OBJECT (self, "newsegment (%s)",
|
|||
- gst_format_get_name (self->segment.format));
|
|||
+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT,
|
|||
+ gst_format_get_name (self->segment.format), &self->segment);
|
|||
+
|
|||
+ self->need_segment = TRUE;
|
|||
|
|||
/* if not time format, we'll either start with a 0 timestamp anyway or |
|||
* it's following a seek in which case we'll have saved the requested |
|||
@ -0,0 +1,42 @@ |
|||
From dddfe1a890dfdadc94dbc07f2cc380c56fc54971 Mon Sep 17 00:00:00 2001 |
|||
From: zhouming <b42586@freescale.com> |
|||
Date: Wed, 14 May 2014 10:16:20 +0800 |
|||
Subject: [PATCH] ENGR00312515: get caps from src pad when query caps |
|||
|
|||
https://bugzilla.gnome.org/show_bug.cgi?id=728312 |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: zhouming <b42586@freescale.com> |
|||
|
|||
---
|
|||
gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ |
|||
1 file changed, 13 insertions(+) |
|||
mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c |
|||
|
|||
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
|
|||
old mode 100644 |
|||
new mode 100755 |
|||
index 8a127c8..71c5d78
|
|||
--- a/gst-libs/gst/tag/gsttagdemux.c
|
|||
+++ b/gst-libs/gst/tag/gsttagdemux.c
|
|||
@@ -1767,6 +1767,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
|
|||
} |
|||
break; |
|||
} |
|||
+ case GST_QUERY_CAPS:
|
|||
+ {
|
|||
+
|
|||
+ /* We can hijack caps query if we typefind already */
|
|||
+ if (demux->priv->src_caps) {
|
|||
+ gst_query_set_caps_result (query, demux->priv->src_caps);
|
|||
+ res = TRUE;
|
|||
+ } else {
|
|||
+ res = gst_pad_query_default (pad, parent, query);
|
|||
+ }
|
|||
+ break;
|
|||
+ }
|
|||
+
|
|||
default: |
|||
res = gst_pad_query_default (pad, parent, query); |
|||
break; |
|||
@ -0,0 +1,42 @@ |
|||
From 105e4e43133854a507097f00aa4cbdde747690ee Mon Sep 17 00:00:00 2001 |
|||
From: Andre McCurdy <armccurdy@gmail.com> |
|||
Date: Wed, 20 Jan 2016 13:00:00 -0800 |
|||
Subject: [PATCH] make gio_unix_2_0 dependency configurable |
|||
|
|||
Prior to 1.7.1, gst-plugins-base accepted a configure option to |
|||
disable gio_unix_2_0, however it was implemented incorrectly using |
|||
AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the |
|||
dependency unconditional. |
|||
|
|||
http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70 |
|||
|
|||
To make builds deterministic, re-instate support for |
|||
--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
|
|||
instead of AG_GST_CHECK_FEATURE. |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
|||
|
|||
---
|
|||
diff --git a/configure.ac b/configure.ac
|
|||
index 12807bc..35a0bf3 100644
|
|||
--- a/configure.ac
|
|||
+++ b/configure.ac
|
|||
@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
|
|||
AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") |
|||
|
|||
dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** |
|||
+AC_ARG_ENABLE([gio_unix_2_0],
|
|||
+ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])],
|
|||
+ [],
|
|||
+ [enable_gio_unix_2_0=yes])
|
|||
+
|
|||
+if test "x${enable_gio_unix_2_0}" != "xno"; then
|
|||
PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24, |
|||
HAVE_GIO_UNIX_2_0="yes", |
|||
HAVE_GIO_UNIX_2_0="no") |
|||
+fi
|
|||
AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") |
|||
|
|||
dnl *** finalize CFLAGS, LDFLAGS, LIBS |
|||
Loading…
Reference in new issue