Date: Monday, October 25, 2021 @ 20:39:46 Author: heftig Revision: 426579
archrelease: copy trunk to extra-x86_64 Added: grilo-plugins/repos/extra-x86_64/0001-grl-lua-factory-Remove-a-bad-pop.patch (from rev 426577, grilo-plugins/trunk/0001-grl-lua-factory-Remove-a-bad-pop.patch) grilo-plugins/repos/extra-x86_64/PKGBUILD (from rev 426577, grilo-plugins/trunk/PKGBUILD) Deleted: grilo-plugins/repos/extra-x86_64/0001-grl-lua-factory-Remove-a-bad-pop.patch grilo-plugins/repos/extra-x86_64/PKGBUILD ---------------------------------------------+ 0001-grl-lua-factory-Remove-a-bad-pop.patch | 46 ++++++------ PKGBUILD | 96 +++++++++++++------------- 2 files changed, 71 insertions(+), 71 deletions(-) Deleted: 0001-grl-lua-factory-Remove-a-bad-pop.patch =================================================================== --- 0001-grl-lua-factory-Remove-a-bad-pop.patch 2021-10-25 20:39:46 UTC (rev 426578) +++ 0001-grl-lua-factory-Remove-a-bad-pop.patch 2021-10-25 20:39:46 UTC (rev 426579) @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Sun, 4 Apr 2021 18:30:57 +0000 -Subject: [PATCH] grl-lua-factory: Remove a bad pop - -This was exposed by Lua 5.4.3, causing a crash. ---- - src/lua-factory/grl-lua-factory.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c -index 4f379841..3a3b8248 100644 ---- a/src/lua-factory/grl-lua-factory.c -+++ b/src/lua-factory/grl-lua-factory.c -@@ -1255,8 +1255,6 @@ table_to_tags (lua_State *L) - lua_pop (L, 1); - } - -- lua_pop (L, 1); -- - if (array->len == 0) { - g_ptr_array_free (array, TRUE); - return NULL; Copied: grilo-plugins/repos/extra-x86_64/0001-grl-lua-factory-Remove-a-bad-pop.patch (from rev 426577, grilo-plugins/trunk/0001-grl-lua-factory-Remove-a-bad-pop.patch) =================================================================== --- 0001-grl-lua-factory-Remove-a-bad-pop.patch (rev 0) +++ 0001-grl-lua-factory-Remove-a-bad-pop.patch 2021-10-25 20:39:46 UTC (rev 426579) @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sun, 4 Apr 2021 18:30:57 +0000 +Subject: [PATCH] grl-lua-factory: Remove a bad pop + +This was exposed by Lua 5.4.3, causing a crash. +--- + src/lua-factory/grl-lua-factory.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c +index 4f379841..3a3b8248 100644 +--- a/src/lua-factory/grl-lua-factory.c ++++ b/src/lua-factory/grl-lua-factory.c +@@ -1255,8 +1255,6 @@ table_to_tags (lua_State *L) + lua_pop (L, 1); + } + +- lua_pop (L, 1); +- + if (array->len == 0) { + g_ptr_array_free (array, TRUE); + return NULL; Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-10-25 20:39:46 UTC (rev 426578) +++ PKGBUILD 2021-10-25 20:39:46 UTC (rev 426579) @@ -1,48 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> - -pkgname=grilo-plugins -pkgver=0.3.13 -pkgrel=2 -epoch=1 -pkgdesc="A collection of plugins for the Grilo framework" -url="https://gitlab.gnome.org/GNOME/grilo-plugins" -arch=(x86_64) -license=(LGPL) -depends=(grilo lua libmediaart libgdata tracker3 gom libdmapsharing chromaprint - gst-plugins-bad gmime3) -makedepends=(git meson gperf yelp-tools) -checkdepends=(gst-plugins-good gst-plugins-base python-gobject tracker3-miners) -optdepends=('dleyna-server: DLNA plugin' - 'tracker3-miners: Tracker plugin') -groups=(gnome) -_commit=660041b7b6460bbe4becef1b675f4f96189cba2b # tags/grilo-plugins-0.3.13^0 -source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit" - 0001-grl-lua-factory-Remove-a-bad-pop.patch) -sha256sums=('SKIP' - '0ee8e2e0810f7e6b5b2c858a98b432e98c4a43e5d1134afb31a17be7f42a3612') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/^grilo-plugins-//;s/-/+/g' -} - -prepare() { - cd $pkgname - - # Fix bug exposed by Lua 5.4.3 - git apply -3 ../0001-grl-lua-factory-Remove-a-bad-pop.patch -} - -build() { - arch-meson $pkgname build -D enable-tracker=no - meson compile -C build -} - -check() { - dbus-run-session meson test -C build --print-errorlogs -} - -package() { - depends+=(libgr{ilo,lnet,lpls}-0.3.so) - DESTDIR="$pkgdir" meson install -C build -} Copied: grilo-plugins/repos/extra-x86_64/PKGBUILD (from rev 426577, grilo-plugins/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-10-25 20:39:46 UTC (rev 426579) @@ -0,0 +1,48 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> + +pkgname=grilo-plugins +pkgver=0.3.14 +pkgrel=1 +epoch=1 +pkgdesc="A collection of plugins for the Grilo framework" +url="https://gitlab.gnome.org/GNOME/grilo-plugins" +arch=(x86_64) +license=(LGPL) +depends=(grilo lua libmediaart libgdata tracker3 gom libdmapsharing chromaprint + gst-plugins-bad gmime3) +makedepends=(git meson gperf yelp-tools) +checkdepends=(gst-plugins-good gst-plugins-base python-gobject tracker3-miners) +optdepends=('dleyna-server: DLNA plugin' + 'tracker3-miners: Tracker plugin') +groups=(gnome) +_commit=9d2afa38e13ff0ea5ddbc32a32900a3f2f496dc5 # tags/grilo-plugins-0.3.14^0 +source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit" + 0001-grl-lua-factory-Remove-a-bad-pop.patch) +sha256sums=('SKIP' + '0ee8e2e0810f7e6b5b2c858a98b432e98c4a43e5d1134afb31a17be7f42a3612') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^grilo-plugins-//;s/-/+/g' +} + +prepare() { + cd $pkgname + + # Fix bug exposed by Lua 5.4.3 + git apply -3 ../0001-grl-lua-factory-Remove-a-bad-pop.patch +} + +build() { + arch-meson $pkgname build -D enable-tracker=no + meson compile -C build +} + +check() { + dbus-run-session meson test -C build --print-errorlogs +} + +package() { + depends+=(libgr{ilo,lnet,lpls}-0.3.so) + meson install -C build --destdir "$pkgdir" +}