git subrepo pull waydroid

subrepo: subdir: "waydroid" merged: "6e8ae5f" upstream: origin: "https://aur.archlinux.org/waydroid.git" branch: "master" commit: "6e8ae5f" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
git subrepo pull waydroid-image
2022-08-20 19:02:20 +02:00 · 2022-08-20 19:02:16 +02:00
7 changed files with 52 additions and 74 deletions
--- a/waydroid-image/.SRCINFO
+++ b/waydroid-image/.SRCINFO
@ -1,6 +1,6 @@
 pkgbase = waydroid-image
 	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system (Android image)
-	pkgver = 17.1_20211021
+	pkgver = 17.1_20220723
 	pkgrel = 1
 	url = https://github.com/waydroid
 	arch = x86_64
@ -9,21 +9,21 @@ pkgbase = waydroid-image
 	arch = aarch64
 	license = Apache
 	depends = waydroid
-	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-17.1-20211021-VANILLA-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 = c56225255380e1707a0380555e1d55961a5bc5e670b2b769724b52ae40283d84
-	sha256sums_x86_64 = 99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1
-	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-17.1-20211021-VANILLA-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 = 76e0e609b1204ec09eed663fe21250ad07550e09b48af381ed3b30f7d69e4d26
-	sha256sums_i686 = b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9
-	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-17.1-20211021-VANILLA-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 = 4e6fba3a7e1f010c131caf507c04f8c8090672c919519273560274005fc6d30b
-	sha256sums_armv7h = 6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba
-	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-17.1-20211021-VANILLA-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 = ea5af33272e9761016d3f36fe7a414ac22b16f70214f5b4839ff75b806a77819
-	sha256sums_aarch64 = e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-17.1-20220723-VANILLA-waydroid_x86_64-system.zip
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-17.1-20220723-MAINLINE-waydroid_x86_64-vendor.zip
+	sha256sums_x86_64 = 82023e7b04adeea64fa0073f335f55300b67c8f4cf866eb1629da2fd2eae072d
+	sha256sums_x86_64 = d76c07ef45232ccf0423fff81f396141176f9e5fbd919134218b9da4200ec2b4
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-17.1-20220723-VANILLA-waydroid_x86-system.zip
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-17.1-20220723-MAINLINE-waydroid_x86-vendor.zip
+	sha256sums_i686 = 2e022c086af68e65129c07fc18c07d54fee6630d7f19024161c4111f238f67a6
+	sha256sums_i686 = 05eece26bd25851b86b19e93d2b3f3c4b50d42d0628bf96a40f96e2df9295ab1
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-17.1-20220723-VANILLA-waydroid_arm-system.zip
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-17.1-20220723-MAINLINE-waydroid_arm-vendor.zip
+	sha256sums_armv7h = 7c7c06135a6c31db6b27cf392c07754890134052b2be5c0c2c7538fea86cfbab
+	sha256sums_armv7h = 71bee674f297fad01f3a31576d08ec9ef7a4d0709d95d7fa6a00e0793109e513
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-17.1-20220723-VANILLA-waydroid_arm64-system.zip
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-17.1-20220723-MAINLINE-waydroid_arm64-vendor.zip
+	sha256sums_aarch64 = fc600f3cfa994c8d5619386b7ef764307731102a4ebd854424487f7858a04d91
+	sha256sums_aarch64 = 4a40747f9a9a5ecdc7d881cf546232a9a8ff68b90ecd489a90f6d6499175da21

 pkgname = waydroid-image
--- a/waydroid-image/.gitrepo
+++ b/waydroid-image/.gitrepo
@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/waydroid-image.git
 	branch = master
-	commit = 103017cec3153f97151fb6c7df445fd46d84bfe0
-	parent = 99951ee7bd5f5094473331f810a8cbbffb941bd0
+	commit = d5ba07787195f27c3d1a94e63006147e53fdda19
+	parent = 537d77870a4f4ee48db90c70b57e00889232d34f
 	method = merge
 	cmdver = 0.4.3
--- a/waydroid-image/PKGBUILD
+++ b/waydroid-image/PKGBUILD
@ -1,8 +1,14 @@
 # Maintainer: Danct12 <danct12@disroot.org>
 # Contributor: Bart Ribbers <bribbers@disroot.org>

-_pkgver_images_system="17.1-20211021"
-_pkgver_images_vendor="17.1-20211021"
+_pkgver_images_system="17.1-20220723"
+_pkgver_images_system_x86="17.1-20220723"
+_pkgver_images_system_arm="17.1-20220723"
+_pkgver_images_system_arm64="17.1-20220723"
+_pkgver_images_vendor="17.1-20220723"
+_pkgver_images_vendor_x86="17.1-20220723"
+_pkgver_images_vendor_arm="17.1-20220723"
+_pkgver_images_vendor_arm64="17.1-20220723"
 pkgname=waydroid-image
 pkgver="${_pkgver_images_system//-/_}"
 pkgrel=1
@ -11,14 +17,14 @@ arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 license=('Apache')
 url='https://github.com/waydroid'
 depends=('waydroid')
-source_i686=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver_images_system-VANILLA-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-VANILLA-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-VANILLA-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-VANILLA-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-VANILLA-waydroid_arm64-system.zip
-  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip)
+source_armv7h=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver_images_system_arm-VANILLA-waydroid_arm-system.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-VANILLA-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" ;;
@ -34,11 +40,11 @@ package() {
  mv "$srcdir/vendor.img" "$pkgdir/usr/share/waydroid-extra/images"
 }

-sha256sums_x86_64=('c56225255380e1707a0380555e1d55961a5bc5e670b2b769724b52ae40283d84'
-                   '99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1')
-sha256sums_i686=('76e0e609b1204ec09eed663fe21250ad07550e09b48af381ed3b30f7d69e4d26'
-                 'b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9')
-sha256sums_armv7h=('4e6fba3a7e1f010c131caf507c04f8c8090672c919519273560274005fc6d30b'
-                   '6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba')
-sha256sums_aarch64=('ea5af33272e9761016d3f36fe7a414ac22b16f70214f5b4839ff75b806a77819'
-                    'e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84')
+sha256sums_x86_64=('82023e7b04adeea64fa0073f335f55300b67c8f4cf866eb1629da2fd2eae072d'
+                   'd76c07ef45232ccf0423fff81f396141176f9e5fbd919134218b9da4200ec2b4')
+sha256sums_i686=('2e022c086af68e65129c07fc18c07d54fee6630d7f19024161c4111f238f67a6'
+                 '05eece26bd25851b86b19e93d2b3f3c4b50d42d0628bf96a40f96e2df9295ab1')
+sha256sums_armv7h=('7c7c06135a6c31db6b27cf392c07754890134052b2be5c0c2c7538fea86cfbab'
+                   '71bee674f297fad01f3a31576d08ec9ef7a4d0709d95d7fa6a00e0793109e513')
+sha256sums_aarch64=('fc600f3cfa994c8d5619386b7ef764307731102a4ebd854424487f7858a04d91'
+                    '4a40747f9a9a5ecdc7d881cf546232a9a8ff68b90ecd489a90f6d6499175da21')
--- a/waydroid/.SRCINFO
+++ b/waydroid/.SRCINFO
@ -1,7 +1,7 @@
 pkgbase = waydroid
 	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system
-	pkgver = 1.2.0
-	pkgrel = 2
+	pkgver = 1.3.0
+	pkgrel = 1
 	url = https://github.com/waydroid
 	arch = any
 	license = GPL
@ -14,11 +14,9 @@ pkgbase = waydroid
 	depends = dnsmasq
 	optdepends = waydroid-image: Android image for use with waydroid
 	optdepends = python-pyclip: share clipboard with container
-	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=9a87b10bbfd9cc04c8259207233fadad9acbf5d3
+	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=1eba5463d904e3e87cc237627d96727a90960624
 	source = gbinder.conf
-	source = 0001-fix-bad-eol-of-proc-dt-values.patch
 	sha256sums = SKIP
 	sha256sums = 87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd
-	sha256sums = a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8

 pkgname = waydroid
--- a/waydroid/.gitrepo
+++ b/waydroid/.gitrepo
@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/waydroid.git
 	branch = master
-	commit = aad9dcb307cc0ee98f36d7acba4f0034ca49c1f8
-	parent = de13eedfb4c7d1b31ea9f26fd326774b7ecd59c3
+	commit = 6e8ae5f90316041b655372c9fb4faaf6e5a4fe37
+	parent = c074bdd5ba85d1b1879caed911a9ca78eca13f73
 	method = merge
 	cmdver = 0.4.3
--- a/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch
+++ b/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch
@ -1,22 +0,0 @@
-From 71f9249c9e08e9abbd08f6ce95d2906c23cfe433 Mon Sep 17 00:00:00 2001
-From: Erfan Abdi <erfangplus@gmail.com>
-Date: Mon, 25 Oct 2021 12:18:02 +0330
-Subject: [PATCH] lxc: Fix bad eol of proc dt values
-
---
- tools/helpers/lxc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
-index 1319442..d57e63c 100644
--- a/tools/helpers/lxc.py
-+++ b/tools/helpers/lxc.py
-@@ -231,7 +231,7 @@ def find_hal(hardware):
-         else:
-             if os.path.isfile("/proc/device-tree/" + product):
-                 with open("/proc/device-tree/" + product) as f:
-                    f_value = f.read().strip()
-+                    f_value = f.read().strip().rstrip('\x00')
-                     if f_value != "":
-                         props.append("ro.product.waydroid." +
-                                      product + "=" + f_value)
--- a/waydroid/PKGBUILD
+++ b/waydroid/PKGBUILD
@ -2,8 +2,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>

 pkgname=waydroid
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A container-based approach to boot a full Android system on a regular Linux system"
 arch=('any')
 url='https://github.com/waydroid'
@ -12,10 +12,9 @@ depends=('lxc' 'python' 'python-gbinder' 'python-gobject' 'nftables' 'dnsmasq')
 makedepends=('git')
 optdepends=('waydroid-image: Android image for use with waydroid'
            'python-pyclip: share clipboard with container')
-_commit="9a87b10bbfd9cc04c8259207233fadad9acbf5d3" # tags/1.2.0
+_commit="1eba5463d904e3e87cc237627d96727a90960624" # tags/1.3.0
 source=("waydroid::git+https://github.com/waydroid/waydroid.git#commit=$_commit"
-        gbinder.conf
-        0001-fix-bad-eol-of-proc-dt-values.patch)
+        gbinder.conf)

 pkgver() {
  cd "$pkgname"
@ -24,7 +23,6 @@ pkgver() {

 prepare() {
  cd waydroid
-  patch -p1 < ../0001-fix-bad-eol-of-proc-dt-values.patch
 }

 package() {
@ -38,10 +36,8 @@ package() {
  ln -s /usr/lib/waydroid/waydroid.py "$pkgdir/usr/bin/waydroid"

  install -Dm644 -t "$pkgdir/etc" "$srcdir/gbinder.conf"
-  install -Dm644 -t "$pkgdir/etc/gbinder.d" gbinder/anbox.conf
-  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" debian/waydroid-container.service
+  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" systemd/waydroid-container.service
 }

 sha256sums=('SKIP'
-            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd'
-            'a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8')
+            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd')