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>
This commit is contained in:
parent
8457e134a2
commit
c5cfcb78f7
|
@ -0,0 +1,55 @@
|
|||
From 81fecd367b016e5ac4fb0c04b84da5c474f30da6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Urbanec <git.user@urbanec.net>
|
||||
Date: Fri, 27 Feb 2015 01:16:58 +1100
|
||||
Subject: [PATCH 1/1] gstinfo: Shorten __FILE__ on all platforms.
|
||||
|
||||
This is useful not only for MSVC, but also with gcc/Linux when doing
|
||||
cross-compilation builds and out-of-tree builds.
|
||||
|
||||
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=745213]
|
||||
|
||||
Signed-off-by: Peter Urbanec <git.user@urbanec.net>
|
||||
---
|
||||
gst/gstinfo.c | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gst/gstinfo.c b/gst/gstinfo.c
|
||||
index b2a3005..8b61d09 100644
|
||||
--- a/gst/gstinfo.c
|
||||
+++ b/gst/gstinfo.c
|
||||
@@ -444,7 +444,6 @@ gst_debug_log (GstDebugCategory * category, GstDebugLevel level,
|
||||
va_end (var_args);
|
||||
}
|
||||
|
||||
-#ifdef G_OS_WIN32
|
||||
/* based on g_basename(), which we can't use because it was deprecated */
|
||||
static inline const gchar *
|
||||
gst_path_basename (const gchar * file_name)
|
||||
@@ -467,7 +466,6 @@ gst_path_basename (const gchar * file_name)
|
||||
|
||||
return file_name;
|
||||
}
|
||||
-#endif
|
||||
|
||||
/**
|
||||
* gst_debug_log_valist:
|
||||
@@ -497,12 +495,11 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level,
|
||||
g_return_if_fail (function != NULL);
|
||||
g_return_if_fail (format != NULL);
|
||||
|
||||
- /* The predefined macro __FILE__ is always the exact path given to the
|
||||
- * compiler with MSVC, which may or may not be the basename. We work
|
||||
- * around it at runtime to improve the readability. */
|
||||
-#ifdef G_OS_WIN32
|
||||
+ /* The predefined macro __FILE__ can be an absolute path in some build
|
||||
+ * environments, such as MSVC or out-of-tree cross-compiles. This may
|
||||
+ * be significantly longer than the filename. We work around it at
|
||||
+ * runtime to improve the readability. */
|
||||
file = gst_path_basename (file);
|
||||
-#endif
|
||||
|
||||
message.message = NULL;
|
||||
message.format = format;
|
||||
--
|
||||
2.3.0
|
||||
|
|
@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
|
|||
SRC_URI = " \
|
||||
http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
|
||||
file://0001-Fix-crash-with-gst-inspect.patch \
|
||||
file://0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "88a9289c64a4950ebb4f544980234289"
|
||||
SRC_URI[sha256sum] = "40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae"
|
||||
|
|
Loading…
Reference in New Issue