diff options
author | 2017-04-25 13:13:57 -0700 | |
---|---|---|
committer | 2017-05-16 05:07:51 +0000 | |
commit | d2eb5b67218f440806f32afa75a751b8c8d218c9 (patch) | |
tree | 05a2b2cc7cae12ea9b8b8ad3026a5b92a7b4eba8 /recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch | |
parent | 0eea4306164f6a6d4567a9857c58fdc59c29a383 (diff) |
qt: enable upgrade to 5.8
Drop patches and bbappends that no longer apply. I audited these to
verify that they already exist upstream, and I believe we are OK.
Change-Id: I83f8334539d5542c7632b45e230d53915fdf18bf
Depends-On: I024b757d16e5891382f4286dadee3315163a79d5
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch b/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch deleted file mode 100644 index 252838fc0..000000000 --- a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-date-time-type-in-metadata.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d0ac492e3023545adad8008a3ebcac2a297dc783 Mon Sep 17 00:00:00 2001 -From: Tasuku Suzuki <tasuku.suzuki@qt.io> -Date: Sun, 24 Jul 2016 00:23:10 +0900 -Subject: [PATCH] GStreamer: support date time type in metadata - -Change-Id: Ica57abfc0a60b401be88662483d35699d4f76321 -Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> ---- - src/gsttools/qgstutils.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp -index b5299f1..831ba96 100644 ---- a/src/gsttools/qgstutils.cpp -+++ b/src/gsttools/qgstutils.cpp -@@ -40,6 +40,7 @@ - #include "qgstutils_p.h" - - #include <QtCore/qdatetime.h> -+#include <QtCore/qtimezone.h> - #include <QtCore/qdir.h> - #include <QtCore/qbytearray.h> - #include <QtCore/qvariant.h> -@@ -123,6 +124,24 @@ static void addTagToMap(const GstTagList *list, - if (!map->contains("year")) - map->insert("year", year); - } -+#if GST_CHECK_VERSION(1,0,0) -+ } else if (G_VALUE_TYPE(&val) == GST_TYPE_DATE_TIME) { -+ const GstDateTime *dateTime = (const GstDateTime *)g_value_get_boxed(&val); -+ int year = gst_date_time_has_year(dateTime) ? gst_date_time_get_year(dateTime) : 0; -+ int month = gst_date_time_has_month(dateTime) ? gst_date_time_get_month(dateTime) : 0; -+ int day = gst_date_time_has_day(dateTime) ? gst_date_time_get_day(dateTime) : 0; -+ if (gst_date_time_has_time(dateTime)) { -+ int hour = gst_date_time_get_hour(dateTime); -+ int minute = gst_date_time_get_minute(dateTime); -+ int second = gst_date_time_get_second(dateTime); -+ float tz = gst_date_time_get_time_zone_offset(dateTime); -+ map->insert(QByteArray(tag), QDateTime(QDate(year,month,day), QTime(hour, minute, second), QTimeZone(tz * 60 * 60))); -+ } else if (year > 0 && month > 0 && day > 0) { -+ map->insert(QByteArray(tag), QDate(year,month,day)); -+ } -+ if (!map->contains("year") && year > 0) -+ map->insert("year", year); -+#endif - } else if (G_VALUE_TYPE(&val) == GST_TYPE_FRACTION) { - int nom = gst_value_get_fraction_numerator(&val); - int denom = gst_value_get_fraction_denominator(&val); --- -2.7.4 - |