summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornate2019-12-10 20:38:21 -0600
committernate2019-12-10 20:38:21 -0600
commitf74c8b2cce3998d512a6a8870cf0fd99407afcdf (patch)
tree96518284938a6b4bc9654de4bf980aa7ece7f683
parentc1e93e410b75fac5bc3ec5d74f1a033f898de172 (diff)
downloadaur-f74c8b2cce3998d512a6a8870cf0fd99407afcdf.tar.gz
remove patch for old xplayer issue
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--xplayer_issues_147.patch25
3 files changed, 4 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b7ebe1e5b3b3..13ab090041bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xplayer-git
pkgdesc = Simple media player. X-Apps Project (git version).
- pkgver = 2.0.2.r0.g49b054a
+ pkgver = 2.2.3.r0.gb3f42a4
pkgrel = 1
url = https://github.com/linuxmint/xplayer
arch = i686
@@ -30,9 +30,7 @@ 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 9a9d22a72a36..fcd5c806a84f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=xplayer-git
_pkgbasename=xplayer
-pkgver=2.0.2.r0.g49b054a
+pkgver=2.2.3.r0.gb3f42a4
pkgrel=1
pkgdesc="Simple media player. X-Apps Project (git version)."
arch=('i686' 'x86_64' 'armv7h')
@@ -18,22 +18,14 @@ provides=($pkgname $_pkgbasename)
conflicts=(${_pkgbasename})
url='https://github.com/linuxmint/xplayer'
-source=("${pkgname}::git+https://github.com/linuxmint/${_pkgbasename}.git"
- 'xplayer_issues_147.patch')
-md5sums=('SKIP'
- '533653d8352f0afcac5c4542f1bc0d84')
+source=("${pkgname}::git+https://github.com/linuxmint/${_pkgbasename}.git")
+md5sums=('SKIP')
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
deleted file mode 100644
index 29480322a74b..000000000000
--- a/xplayer_issues_147.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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"))
-