Add patch for https://github.com/linuxmint/xplayer/issues/147

3 files changed, 39 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b77cf4cdd133..b7ebe1e5b3b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xplayer-git
 	pkgdesc = Simple media player. X-Apps Project (git version).
-	pkgver = 2.0.0.r0.gf73aa65
+	pkgver = 2.0.2.r0.g49b054a
 	pkgrel = 1
 	url = https://github.com/linuxmint/xplayer
 	arch = i686
@@ -30,7 +30,9 @@ pkgbase = xplayer-git
 	provides = xplayer
 	conflicts = xplayer
 	source = xplayer-git::git+https://github.com/linuxmint/xplayer.git
+	source = xplayer_issues_147.patch
 	md5sums = SKIP
+	md5sums = 533653d8352f0afcac5c4542f1bc0d84
 
 pkgname = xplayer-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 536ff4e2d130..06a295dc696c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=xplayer-git
 _pkgbasename=xplayer
-pkgver=2.0.0.r0.gf73aa65
+pkgver=2.0.2.r0.g49b054a
 pkgrel=1
 pkgdesc="Simple media player. X-Apps Project (git version)."
 arch=('i686' 'x86_64' 'armv7h')
@@ -18,14 +18,22 @@ provides=($pkgname $_pkgbasename)
 conflicts=(${_pkgbasename})
 url='https://github.com/linuxmint/xplayer'
 
-source=("${pkgname}::git+https://github.com/linuxmint/${_pkgbasename}.git")
-md5sums=('SKIP')
+source=("${pkgname}::git+https://github.com/linuxmint/${_pkgbasename}.git"
+        'xplayer_issues_147.patch')
+md5sums=('SKIP'
+        '533653d8352f0afcac5c4542f1bc0d84')
 
 pkgver() {
     cd ${srcdir}/${pkgname}
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+	cd "${srcdir}/${pkgname}"
+	patch --strip=1 --input="${srcdir}/xplayer_issues_147.patch"
+}
+
+
 build() {
     cd ${srcdir}/${pkgname}
 
diff --git a/xplayer_issues_147.patch b/xplayer_issues_147.patch
new file mode 100644
index 000000000000..29480322a74b
--- /dev/null
+++ b/xplayer_issues_147.patch
@@ -0,0 +1,25 @@
+From 30029a515f68290f8e85f4b7344d50fce66d74f8 Mon Sep 17 00:00:00 2001
+From: DJ Sutton <dj@laptop>
+Date: Mon, 13 May 2019 17:55:23 -0600
+Subject: [PATCH] check for bvw->priv->tagcache == NULL in bacon-video-widget.c
+ update_orientation_from_video
+
+---
+ src/backend/bacon-video-widget.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
+index e95dc4b..444413c 100644
+--- a/src/backend/bacon-video-widget.c
++++ b/src/backend/bacon-video-widget.c
+@@ -1715,6 +1715,9 @@ update_orientation_from_video (BaconVideoWidget *bvw)
+   if (bvw->priv->rotation != BVW_ROTATION_R_ZERO)
+     return;
+ 
++  if (bvw->priv->tagcache == NULL)
++    return;
++
+   ret = gst_tag_list_get_string_index (bvw->priv->tagcache,
+ 				       GST_TAG_IMAGE_ORIENTATION, 0, &orientation_str);
+   if (!ret || !orientation_str || g_str_equal (orientation_str, "rotate-0"))
+