summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorPeter Urbanec <openembedded-devel@urbanec.net>2015-02-27 04:31:33 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 23:56:00 +0000
commitc5cfcb78f7b2acb3914d005725f9936c0382657d (patch)
tree8aa54d708d72fbbaeb0ede0e09312e8378afb27f /meta/recipes-multimedia/gstreamer
parent8457e134a22c9a63bdc6b629a27f0978a7a9bd6e (diff)
downloadpoky-c5cfcb78f7b2acb3914d005725f9936c0382657d.tar.gz
gstreamer1.0: Shorten __FILE__ in gst_debug_log output on all platforms.
On WIN32 the file argument to gst_debug_log_valist is shortened to just the filename. This is useful not only for MSVC, but also with gcc/Linux when doing cross-compilation builds and out-of-tree builds. (From OE-Core rev: d419be56df59c91294923ba4e136d8753009c280) Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch55
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb1
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch
new file mode 100644
index 0000000000..8213c4b8b5
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch
@@ -0,0 +1,55 @@
1From 81fecd367b016e5ac4fb0c04b84da5c474f30da6 Mon Sep 17 00:00:00 2001
2From: Peter Urbanec <git.user@urbanec.net>
3Date: Fri, 27 Feb 2015 01:16:58 +1100
4Subject: [PATCH 1/1] gstinfo: Shorten __FILE__ on all platforms.
5
6This is useful not only for MSVC, but also with gcc/Linux when doing
7cross-compilation builds and out-of-tree builds.
8
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=745213]
10
11Signed-off-by: Peter Urbanec <git.user@urbanec.net>
12---
13 gst/gstinfo.c | 11 ++++-------
14 1 file changed, 4 insertions(+), 7 deletions(-)
15
16diff --git a/gst/gstinfo.c b/gst/gstinfo.c
17index b2a3005..8b61d09 100644
18--- a/gst/gstinfo.c
19+++ b/gst/gstinfo.c
20@@ -444,7 +444,6 @@ gst_debug_log (GstDebugCategory * category, GstDebugLevel level,
21 va_end (var_args);
22 }
23
24-#ifdef G_OS_WIN32
25 /* based on g_basename(), which we can't use because it was deprecated */
26 static inline const gchar *
27 gst_path_basename (const gchar * file_name)
28@@ -467,7 +466,6 @@ gst_path_basename (const gchar * file_name)
29
30 return file_name;
31 }
32-#endif
33
34 /**
35 * gst_debug_log_valist:
36@@ -497,12 +495,11 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level,
37 g_return_if_fail (function != NULL);
38 g_return_if_fail (format != NULL);
39
40- /* The predefined macro __FILE__ is always the exact path given to the
41- * compiler with MSVC, which may or may not be the basename. We work
42- * around it at runtime to improve the readability. */
43-#ifdef G_OS_WIN32
44+ /* The predefined macro __FILE__ can be an absolute path in some build
45+ * environments, such as MSVC or out-of-tree cross-compiles. This may
46+ * be significantly longer than the filename. We work around it at
47+ * runtime to improve the readability. */
48 file = gst_path_basename (file);
49-#endif
50
51 message.message = NULL;
52 message.format = format;
53--
542.3.0
55
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
index 94be84618e..0a2ce86343 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 file://0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch \
9" 10"
10SRC_URI[md5sum] = "88a9289c64a4950ebb4f544980234289" 11SRC_URI[md5sum] = "88a9289c64a4950ebb4f544980234289"
11SRC_URI[sha256sum] = "40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae" 12SRC_URI[sha256sum] = "40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae"