From b42f6eb0a01604fd6e5c909ff1a4b5220980928d Mon Sep 17 00:00:00 2001 From: DJ Sutton Date: Mon, 13 May 2019 18:14:27 -0600 Subject: [PATCH 1/2] add patch to check for bvw->priv->tagcache == NULL in bacon-video-widget.c update_orientation_from_video --- PKGBUILD | 11 +++++++++-- update_orientation_check_null.patch | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 update_orientation_check_null.patch diff --git a/PKGBUILD b/PKGBUILD index cdb1fce..e815b12 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,10 +20,17 @@ provides=($pkgname) conflicts=('xplayer-git') url='https://github.com/linuxmint/xplayer' -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz") -md5sums=('46526042743d6b0af60bbbb7a4388d66') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz" + "update_orientation_check_null.patch") +md5sums=('46526042743d6b0af60bbbb7a4388d66' + '8bb94143b474c672b8e2b762477b15cd') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch --strip=1 --input="${srcdir}/update_orientation_check_null.patch" +} + build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/update_orientation_check_null.patch b/update_orientation_check_null.patch new file mode 100644 index 0000000..312250c --- /dev/null +++ b/update_orientation_check_null.patch @@ -0,0 +1,14 @@ +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")) From 9b87a78be45c7d9bc13280f7eb9ed2777b788f14 Mon Sep 17 00:00:00 2001 From: DJ Sutton Date: Mon, 13 May 2019 18:42:01 -0600 Subject: [PATCH 2/2] increment pkgrel and update .SRCINFO for new patched build --- .SRCINFO | 4 +++- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2035ddc..e6f450a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = xplayer pkgdesc = Simple media player. X-Apps Project. pkgver = 2.0.2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/linuxmint/xplayer arch = i686 arch = x86_64 @@ -30,7 +30,9 @@ pkgbase = xplayer provides = xplayer conflicts = xplayer-git source = xplayer-2.0.2.tar.gz::https://github.com/linuxmint/xplayer/archive/2.0.2.tar.gz + source = update_orientation_check_null.patch md5sums = 46526042743d6b0af60bbbb7a4388d66 + md5sums = 8bb94143b474c672b8e2b762477b15cd pkgname = xplayer diff --git a/PKGBUILD b/PKGBUILD index e815b12..06b9261 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=xplayer pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Simple media player. X-Apps Project." arch=('i686' 'x86_64' 'armv7h') license=('GPL')