Updated to latest images

3 files changed, 69 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14a0072132ad..f644cb20c29a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waydroid-image-gapps
 	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system (Android image, GAPPS).
-	pkgver = 17.1_20211021
+	pkgver = 17.1_20220515
 	pkgrel = 2
 	url = https://github.com/waydroid
 	arch = x86_64
@@ -10,21 +10,21 @@ pkgbase = waydroid-image-gapps
 	license = Apache
 	depends = waydroid
 	provides = waydroid-image
-	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-17.1-20211021-GAPPS-waydroid_x86_64-system.zip
-	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-17.1-20211021-MAINLINE-waydroid_x86_64-vendor.zip
-	sha256sums_x86_64 = ebd7c57f32a4b3e39c7e1c2fcd5954d69b3c7bdf78a92bffd5d416173554df19
-	sha256sums_x86_64 = 99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1
-	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-17.1-20211021-GAPPS-waydroid_x86-system.zip
-	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-17.1-20211021-MAINLINE-waydroid_x86-vendor.zip
-	sha256sums_i686 = dd6987178049801a8a6b5f4962426897e6e9d55480c9fded95279fa7f4bb66ef
-	sha256sums_i686 = b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9
-	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-17.1-20211020-GAPPS-waydroid_arm-system.zip
-	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-17.1-20211021-MAINLINE-waydroid_arm-vendor.zip
-	sha256sums_armv7h = 800400d7d11710992aa7b5c8adf6811a21be9b20c65569944e1703ca4bd4fa67
-	sha256sums_armv7h = 6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba
-	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-17.1-20211021-GAPPS-waydroid_arm64-system.zip
-	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-17.1-20211021-MAINLINE-waydroid_arm64-vendor.zip
-	sha256sums_aarch64 = 579a9bc28c2c0f39590105d78b5abf61ac197f3cf3f701a7104c752567bc0fc3
-	sha256sums_aarch64 = e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-17.1-20220515-GAPPS-waydroid_x86_64-system.zip
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-17.1-20220515-MAINLINE-waydroid_x86_64-vendor.zip
+	sha256sums_x86_64 = d9c31855a230fc756368547972439eca9249658967c4ae3110bb1e95a6fe99b3
+	sha256sums_x86_64 = 62ebdddd09234d57b31ff601a8fc35d84634e2b4e6308d4d17c2ccff77708433
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-17.1-20220514-GAPPS-waydroid_x86-system.zip
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-17.1-20220514-MAINLINE-waydroid_x86-vendor.zip
+	sha256sums_i686 = 613815e4b17671d407b7f085a8de130ab34febaaa70a0428bb011c4a258a5e9b
+	sha256sums_i686 = 8c6dfa3352d645a20f755ada801911fe99b266c0b1be911a51b649f1e12cbfc7
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-17.1-20220514-GAPPS-waydroid_arm-system.zip
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-17.1-20220514-MAINLINE-waydroid_arm-vendor.zip
+	sha256sums_armv7h = 9b2ed16ae38e8471f85b8f0dd52b57ef18fb114274d8f09d537e81318c9f9d47
+	sha256sums_armv7h = b78d349ffcbfc5fb1c73258cf9d1f6e624c94aafa330d03e46b18731d9579dc1
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-17.1-20220514-GAPPS-waydroid_arm64-system.zip
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-17.1-20220514-MAINLINE-waydroid_arm64-vendor.zip
+	sha256sums_aarch64 = a560d41d03d3c11fa88fabfecd3b2126ce76f31423bf5d8f23465399e628106f
+	sha256sums_aarch64 = 15d62909bafac2ddd603726e2c5f9b1ae39a37bb0bbd4226587240ee25ad3146
 
 pkgname = waydroid-image-gapps
diff --git a/PKGBUILD b/PKGBUILD
index 67320b1a7ae0..9fce4492e487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,16 @@
 # Maintainer: farwayer <farwayer@gmail.com>
+# Co-maintainer: Markus Hartung (harre) <mail@hartmark.se>
 # Contributer: Danct12 <danct12@disroot.org>
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 
-_pkgver_images_system="17.1-20211021"
-_pkgver_images_system_arm="17.1-20211020"
-_pkgver_images_vendor="17.1-20211021"
+_pkgver_images_system="17.1-20220515"
+_pkgver_images_system_x86="17.1-20220514"
+_pkgver_images_system_arm="17.1-20220514"
+_pkgver_images_system_arm64="17.1-20220514"
+_pkgver_images_vendor="17.1-20220515"
+_pkgver_images_vendor_x86="17.1-20220514"
+_pkgver_images_vendor_arm="17.1-20220514"
+_pkgver_images_vendor_arm64="17.1-20220514"
 pkgname=waydroid-image-gapps
 pkgver="${_pkgver_images_system//-/_}"
 pkgrel=2
@@ -14,14 +20,14 @@ license=('Apache')
 url='https://github.com/waydroid'
 depends=('waydroid')
 provides=('waydroid-image')
-source_i686=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver_images_system-GAPPS-waydroid_x86-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip)
+source_i686=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver_images_system_x86-GAPPS-waydroid_x86-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor_x86-MAINLINE-waydroid_x86-vendor.zip)
 source_x86_64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver_images_system-GAPPS-waydroid_x86_64-system.zip
   https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip)
 source_armv7h=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver_images_system_arm-GAPPS-waydroid_arm-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip)
-source_aarch64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver_images_system-GAPPS-waydroid_arm64-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip)
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor_arm-MAINLINE-waydroid_arm-vendor.zip)
+source_aarch64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver_images_system_arm64-GAPPS-waydroid_arm64-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor_arm64-MAINLINE-waydroid_arm64-vendor.zip)
 
 case "$CARCH" in
   aarch64) _imgarch="arm64" ;;
@@ -37,11 +43,11 @@ package() {
   mv "$srcdir/vendor.img" "$pkgdir/usr/share/waydroid-extra/images"
 }
 
-sha256sums_x86_64=('ebd7c57f32a4b3e39c7e1c2fcd5954d69b3c7bdf78a92bffd5d416173554df19'
-                   '99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1')
-sha256sums_i686=('dd6987178049801a8a6b5f4962426897e6e9d55480c9fded95279fa7f4bb66ef'
-                 'b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9')
-sha256sums_armv7h=('800400d7d11710992aa7b5c8adf6811a21be9b20c65569944e1703ca4bd4fa67'
-                   '6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba')
-sha256sums_aarch64=('579a9bc28c2c0f39590105d78b5abf61ac197f3cf3f701a7104c752567bc0fc3'
-                    'e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84')
+sha256sums_x86_64=('d9c31855a230fc756368547972439eca9249658967c4ae3110bb1e95a6fe99b3'
+                   '62ebdddd09234d57b31ff601a8fc35d84634e2b4e6308d4d17c2ccff77708433')
+sha256sums_i686=('613815e4b17671d407b7f085a8de130ab34febaaa70a0428bb011c4a258a5e9b'
+                 '8c6dfa3352d645a20f755ada801911fe99b266c0b1be911a51b649f1e12cbfc7')
+sha256sums_armv7h=('9b2ed16ae38e8471f85b8f0dd52b57ef18fb114274d8f09d537e81318c9f9d47'
+                   'b78d349ffcbfc5fb1c73258cf9d1f6e624c94aafa330d03e46b18731d9579dc1')
+sha256sums_aarch64=('a560d41d03d3c11fa88fabfecd3b2126ce76f31423bf5d8f23465399e628106f'
+                    '15d62909bafac2ddd603726e2c5f9b1ae39a37bb0bbd4226587240ee25ad3146')
diff --git a/get-latest-images-urls.sh b/get-latest-images-urls.sh
new file mode 100755
index 000000000000..d99235b95024
--- /dev/null
+++ b/get-latest-images-urls.sh
@@ -0,0 +1,30 @@
+#!/bin/zsh
+curl 'https://sourceforge.net/projects/waydroid/rss?path=/images' -o file-list.rss
+echo "Latest x86_64 vendor:"
+grep link file-list.rss | grep -- '-waydroid_x86_64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest x86_64 GAPPS:"
+grep link file-list.rss | grep -- '-GAPPS-waydroid_x86_64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo
+
+echo "Latest x86 vendor:"
+grep link file-list.rss | grep -- '-waydroid_x86-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest x86 GAPPS:"
+grep link file-list.rss | grep -- '-GAPPS-waydroid_x86-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo
+
+echo "Latest arm64 vendor:"
+grep link file-list.rss | grep -- '-waydroid_arm64-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest arm64 GAPPS:"
+grep link file-list.rss | grep -- '-GAPPS-waydroid_arm64-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo
+
+echo "Latest arm vendor:"
+grep link file-list.rss | grep -- '-waydroid_arm-vendor.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+echo "Latest arm GAPPS:"
+grep link file-list.rss | grep -- '-GAPPS-waydroid_arm-system.zip' | sed 's/<[^>]*>//g' | sed -E 's/\/download//' | sed -E 's/\s+//g' | head -1 | grep --color -E '[0-9]{8}'
+
+#cleanup
+#rm file-list.rss
+
+# perhaps fix in future so we change date in PKGBUILD and then do
+# updpkgsums (util found in pacman-contrib so the checksums is updated)