Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: waydroid
@ 2021-09-26 15:25 Johnnynator
  2021-09-26 15:34 ` [PR PATCH] [Updated] " Johnnynator
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: Johnnynator @ 2021-09-26 15:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1794 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135

New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 11791 bytes --]

From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/5] New package: libglibutil-1.0.55

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..571a963eed08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -108,6 +108,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From eff6661da793b26873b7b6353052cc827a509945 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/5] New package: libgbinder-1.1.11

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 571a963eed08..67eb1e25e6c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From bddb08a5fe10d1a08b59135880abb4cbecb962ab Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/5] New package: waydroid-0.0.0.13092021

---
 srcpkgs/waydroid/files/gbinder.conf           |  2 ++
 srcpkgs/waydroid/files/waydroid-container/run |  3 ++
 .../waydroid/files/waydroid-session.desktop   |  8 ++++++
 srcpkgs/waydroid/template                     | 28 +++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..ec20118ee434
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,28 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=0.0.0.13092021
+revision=1
+_commit=15bbf62e43e8e2482aab809d24153fcbfc83a7bf
+wrksrc="waydroid-$_commit"
+depends="waydroid-image gbinder-python lxc python3-gobject"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
+checksum=f1237dc85b5b5a730bf7bd0c7c4de1979ab9c78473b78afa778eb8b2a2890f78
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vmkdir usr/bin
+
+	vcopy tools usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vinstall waydroid.py 755 usr/lib/waydroid
+	ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall $FILESDIR/gbinder.conf 644 etc
+	vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+	vsv waydroid-container
+}

From e8aad3f07fa52d23e4755edc2dc53d7d77909cd2 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:59 +0200
Subject: [PATCH 4/5] New package: waydroid-image-17.1.20210913

---
 srcpkgs/waydroid-image/template | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/waydroid-image/template

diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
new file mode 100644
index 000000000000..5c6091edd72e
--- /dev/null
+++ b/srcpkgs/waydroid-image/template
@@ -0,0 +1,51 @@
+# Template file for 'waydroid-image'
+pkgname=waydroid-image
+version=17.1.20210913
+_pkgver="17.1-20210913"
+_pkgver_images_vendor="17.1-20210907"
+revision=1
+archs="arm* aarch64* x86_64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-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_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
+ 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
+ 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
+ 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
+ fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
+ 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
+ dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
+ 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
+
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

From 23c151560c09a0665bc903b855a3b5f9a772ded1 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 5/5] New package: gbinder-python-0.0.0.20210812

---
 srcpkgs/gbinder-python/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
@ 2021-09-26 15:34 ` Johnnynator
  2021-09-26 16:21 ` Johnnynator
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2021-09-26 15:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135

New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Quick notes for testing:

- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`

A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 11791 bytes --]

From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/5] New package: libglibutil-1.0.55

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..571a963eed08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -108,6 +108,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From eff6661da793b26873b7b6353052cc827a509945 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/5] New package: libgbinder-1.1.11

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 571a963eed08..67eb1e25e6c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 2063f464edeb8f9443ffe075ab12564c51d82f00 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/5] New package: waydroid-0.0.0.13092021

---
 srcpkgs/waydroid/files/gbinder.conf           |  2 ++
 srcpkgs/waydroid/files/waydroid-container/run |  3 ++
 .../waydroid/files/waydroid-session.desktop   |  8 ++++++
 srcpkgs/waydroid/template                     | 28 +++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..0d6621bc0679
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,28 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=0.0.0.20210924
+revision=1
+_commit=e990576ec954ab53cdac5e534f5897d5f3ed0996
+wrksrc="waydroid-$_commit"
+depends="waydroid-image gbinder-python lxc python3-gobject"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
+checksum=ca0cc055aed6925e0d22a8a1ce5bca31c89b96398be3d82f5f517c5526b4a5a8
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vmkdir usr/bin
+
+	vcopy tools usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vinstall waydroid.py 755 usr/lib/waydroid
+	ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall $FILESDIR/gbinder.conf 644 etc
+	vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+	vsv waydroid-container
+}

From 6a7edeb1e4dd0db7cd893d9bbe1196c15a6273f3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:59 +0200
Subject: [PATCH 4/5] New package: waydroid-image-17.1.20210913

---
 srcpkgs/waydroid-image/template | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/waydroid-image/template

diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
new file mode 100644
index 000000000000..5c6091edd72e
--- /dev/null
+++ b/srcpkgs/waydroid-image/template
@@ -0,0 +1,51 @@
+# Template file for 'waydroid-image'
+pkgname=waydroid-image
+version=17.1.20210913
+_pkgver="17.1-20210913"
+_pkgver_images_vendor="17.1-20210907"
+revision=1
+archs="arm* aarch64* x86_64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-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_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
+ 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
+ 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
+ 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
+ fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
+ 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
+ dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
+ 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
+
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

From eb3002ed851519002c3babe6f31374084d1fe174 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 5/5] New package: gbinder-python-0.0.0.20210812

---
 srcpkgs/gbinder-python/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
  2021-09-26 15:34 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-09-26 16:21 ` Johnnynator
  2021-09-26 16:55 ` Anachron
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2021-09-26 16:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135

New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Quick notes for testing:

- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`

A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 19418 bytes --]

From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/7] New package: libglibutil-1.0.55

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..571a963eed08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -108,6 +108,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From eff6661da793b26873b7b6353052cc827a509945 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/7] New package: libgbinder-1.1.11

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 571a963eed08..67eb1e25e6c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From f1aeabd98be6d9679bfb5f7fa8061ff0bf29325d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/7] New package: waydroid-0.0.0.13092021

---
 srcpkgs/waydroid/files/gbinder.conf           |  2 ++
 srcpkgs/waydroid/files/waydroid-container/run |  3 ++
 .../waydroid/files/waydroid-session.desktop   |  8 +++++
 srcpkgs/waydroid/template                     | 29 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..6bd7433b0e3d
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,29 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=0.0.0.20210924
+revision=1
+_commit=e990576ec954ab53cdac5e534f5897d5f3ed0996
+wrksrc="waydroid-$_commit"
+depends="waydroid-image gbinder-python lxc python3-gobject"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
+checksum=ca0cc055aed6925e0d22a8a1ce5bca31c89b96398be3d82f5f517c5526b4a5a8
+pycompile_dirs="/usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vmkdir usr/bin
+
+	vcopy tools usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vinstall waydroid.py 755 usr/lib/waydroid
+	ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall $FILESDIR/gbinder.conf 644 etc
+	vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+	vsv waydroid-container
+}

From 9f533eb07e85de5d312fe199ecace276485ae98a Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:59 +0200
Subject: [PATCH 4/7] New package: waydroid-image-17.1.20210913

---
 srcpkgs/waydroid-image/template | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/waydroid-image/template

diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
new file mode 100644
index 000000000000..5c6091edd72e
--- /dev/null
+++ b/srcpkgs/waydroid-image/template
@@ -0,0 +1,51 @@
+# Template file for 'waydroid-image'
+pkgname=waydroid-image
+version=17.1.20210913
+_pkgver="17.1-20210913"
+_pkgver_images_vendor="17.1-20210907"
+revision=1
+archs="arm* aarch64* x86_64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-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_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
+ 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
+ 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
+ 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
+ fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
+ 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
+ dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
+ 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
+
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

From fc74891e5c6f286299fba088f683c25eabe666d0 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 5/7] New package: gbinder-python-0.0.0.20210812

---
 srcpkgs/gbinder-python/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9

From f8a9492fac81e6e4ed20a26f5becf0007e0ebccb Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sun, 26 Sep 2021 18:21:16 +0200
Subject: [PATCH 6/7] New package: waydroid-image-aarch64-17.1.20210926

---
 srcpkgs/waydroid-image-aarch64/template | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/waydroid-image-aarch64/template

diff --git a/srcpkgs/waydroid-image-aarch64/template b/srcpkgs/waydroid-image-aarch64/template
new file mode 100644
index 000000000000..2c9943b46b03
--- /dev/null
+++ b/srcpkgs/waydroid-image-aarch64/template
@@ -0,0 +1,47 @@
+# Template file for 'waydroid-image-aarch64'
+pkgname=waydroid-image-aarch64
+version=17.1.20210926
+_pkgver="17.1-20210926"
+_pkgver_images_vendor="17.1-20210925"
+revision=1
+archs="aarch64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip"
+checksum="2a1c622e0ee2c37193a2f3a752747727fa9d55286df26170a3121f7288bb49b0
+ 93c92e258bc7d04b2e84261fa2cca4fcbf4b2f7c7d82bf3e9f652a08e8c2d060"
+distfiles_arm="
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+distfiles_x86="
+https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+"
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

From bb9c6d7284550955094b582a975c20b6d7845936 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sun, 26 Sep 2021 18:21:23 +0200
Subject: [PATCH 7/7] fixup! New package: waydroid-0.0.0.13092021

---
 srcpkgs/waydroid-image/template | 51 ---------------------------------
 srcpkgs/waydroid/template       |  7 ++++-
 2 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/waydroid-image/template

diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
deleted file mode 100644
index 5c6091edd72e..000000000000
--- a/srcpkgs/waydroid-image/template
+++ /dev/null
@@ -1,51 +0,0 @@
-# Template file for 'waydroid-image'
-pkgname=waydroid-image
-version=17.1.20210913
-_pkgver="17.1-20210913"
-_pkgver_images_vendor="17.1-20210907"
-revision=1
-archs="arm* aarch64* x86_64*"
-hostmakedepends="unzip"
-short_desc="Android containers for use in Waydroid"
-maintainer="John <me@johnnynator.dev>"
-license="Apache-2.0"
-homepage="https://waydro.id"
-distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-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_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
-checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
- 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
- 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
- 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
- fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
- 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
- dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
- 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
-
-case "$XBPS_TARGET_MACHINE" in
-        aarch64*) _imgarch="arm64" ;;
-        arm*) _imgarch="arm" ;;
-        *) _imgarch="$MACHINE" ;;
-esac
-
-do_extract() {
-        # Overwriting as it's easier to install directly while unzipping and we
-        # don't need other arches than the native unpacked
-        :
-}
-
-do_install() {
-        vmkdir usr/share/waydroid-extra/images
-
-        unzip -n \
-                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
-                        -d "$DESTDIR"/usr/share/waydroid-extra/images
-        unzip -n \
-                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
-                        -d "$DESTDIR"/usr/share/waydroid-extra/images
-}
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index 6bd7433b0e3d..6c879a6014f4 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -4,7 +4,7 @@ version=0.0.0.20210924
 revision=1
 _commit=e990576ec954ab53cdac5e534f5897d5f3ed0996
 wrksrc="waydroid-$_commit"
-depends="waydroid-image gbinder-python lxc python3-gobject"
+depends="gbinder-python lxc python3-gobject"
 short_desc="Container-based approach to boot a full Android system"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
@@ -12,6 +12,11 @@ homepage="https://waydro.id"
 distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
 checksum=ca0cc055aed6925e0d22a8a1ce5bca31c89b96398be3d82f5f517c5526b4a5a8
 pycompile_dirs="/usr/lib/waydroid"
+python_version=3
+
+case "$XBPS_TARGET_ARCH" in
+	aarch64*) depends+=" waydroid-image-aarch64";;
+esac
 
 do_install() {
 	vmkdir usr/lib/waydroid

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
  2021-09-26 15:34 ` [PR PATCH] [Updated] " Johnnynator
  2021-09-26 16:21 ` Johnnynator
@ 2021-09-26 16:55 ` Anachron
  2021-09-26 17:36 ` Johnnynator
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Anachron @ 2021-09-26 16:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-927336403

Comment:
Does this require wayland or is there a wrapper for X?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (2 preceding siblings ...)
  2021-09-26 16:55 ` Anachron
@ 2021-09-26 17:36 ` Johnnynator
  2021-09-28 13:09 ` [PR PATCH] [Updated] " Johnnynator
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2021-09-26 17:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-927342280

Comment:
You need to run it inside wayland, You can abuse wlroots probably to have a wayland wm ontop of X.

(This also needs binder support, which is only enabled in our pinebookpro and pinephone kernels right now)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (3 preceding siblings ...)
  2021-09-26 17:36 ` Johnnynator
@ 2021-09-28 13:09 ` Johnnynator
  2021-09-28 17:35 ` q66
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2021-09-28 13:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135

New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Quick notes for testing:

- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`

A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 14956 bytes --]

From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/6] New package: libglibutil-1.0.55

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..571a963eed08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -108,6 +108,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From eff6661da793b26873b7b6353052cc827a509945 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/6] New package: libgbinder-1.1.11

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 571a963eed08..67eb1e25e6c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 49fa2245357a78590fec47dbbd9a23a8bb5e1d13 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/6] New package: waydroid-1.1.0

---
 srcpkgs/waydroid/files/gbinder.conf           |  2 ++
 srcpkgs/waydroid/files/waydroid-container/run |  3 ++
 .../waydroid/files/waydroid-session.desktop   |  8 +++++
 srcpkgs/waydroid/template                     | 32 +++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..31a1bc2919ec
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,32 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.1.0
+revision=1
+depends="gbinder-python lxc python3-gobject"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${version}.tar.gz"
+checksum=2791238f3d86ea606841d72a1b4579063076c215357c6dfe1bbfec5da11a812b
+pycompile_dirs="/usr/lib/waydroid"
+python_version=3
+
+case "$XBPS_TARGET_ARCH" in
+	aarch64*) depends+=" waydroid-image-aarch64";;
+esac
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vmkdir usr/bin
+
+	vcopy tools usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vinstall waydroid.py 755 usr/lib/waydroid
+	ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall $FILESDIR/gbinder.conf 644 etc
+	vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+	vsv waydroid-container
+}

From 9bbb6f51b6a18745c7d0bc9cdff0f3b9b98b8e80 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:59 +0200
Subject: [PATCH 4/6] New package: waydroid-image-17.1.20210913

---
 srcpkgs/waydroid-image/template | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/waydroid-image/template

diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
new file mode 100644
index 000000000000..5c6091edd72e
--- /dev/null
+++ b/srcpkgs/waydroid-image/template
@@ -0,0 +1,51 @@
+# Template file for 'waydroid-image'
+pkgname=waydroid-image
+version=17.1.20210913
+_pkgver="17.1-20210913"
+_pkgver_images_vendor="17.1-20210907"
+revision=1
+archs="arm* aarch64* x86_64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-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_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
+ 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
+ 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
+ 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
+ fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
+ 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
+ dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
+ 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
+
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

From 9f7c5c7956ade73d1408d57719257257cd9b8e74 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 5/6] New package: gbinder-python-0.0.0.20210812

---
 srcpkgs/gbinder-python/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9

From 087f2adfe2c24630d6b2f6cdde60de2e46f53dd3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sun, 26 Sep 2021 18:21:16 +0200
Subject: [PATCH 6/6] New package: waydroid-image-aarch64-17.1.20210926

---
 srcpkgs/waydroid-image-aarch64/template | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/waydroid-image-aarch64/template

diff --git a/srcpkgs/waydroid-image-aarch64/template b/srcpkgs/waydroid-image-aarch64/template
new file mode 100644
index 000000000000..2c9943b46b03
--- /dev/null
+++ b/srcpkgs/waydroid-image-aarch64/template
@@ -0,0 +1,47 @@
+# Template file for 'waydroid-image-aarch64'
+pkgname=waydroid-image-aarch64
+version=17.1.20210926
+_pkgver="17.1-20210926"
+_pkgver_images_vendor="17.1-20210925"
+revision=1
+archs="aarch64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip"
+checksum="2a1c622e0ee2c37193a2f3a752747727fa9d55286df26170a3121f7288bb49b0
+ 93c92e258bc7d04b2e84261fa2cca4fcbf4b2f7c7d82bf3e9f652a08e8c2d060"
+distfiles_arm="
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+distfiles_x86="
+https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+"
+case "$XBPS_TARGET_MACHINE" in
+        aarch64*) _imgarch="arm64" ;;
+        arm*) _imgarch="arm" ;;
+        *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+        # Overwriting as it's easier to install directly while unzipping and we
+        # don't need other arches than the native unpacked
+        :
+}
+
+do_install() {
+        vmkdir usr/share/waydroid-extra/images
+
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+        unzip -n \
+                        -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+                        -d "$DESTDIR"/usr/share/waydroid-extra/images
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (4 preceding siblings ...)
  2021-09-28 13:09 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-09-28 17:35 ` q66
  2022-01-23  1:15 ` notthewave
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2021-09-28 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-929477768

Comment:
what's the deal with the aarch64 image package?

also might make sense to restrict waydroid for archs it actually works on

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (5 preceding siblings ...)
  2021-09-28 17:35 ` q66
@ 2022-01-23  1:15 ` notthewave
  2022-01-23  1:16 ` [PR REVIEW] " notthewave
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: notthewave @ 2022-01-23  1:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1019388750

Comment:
Do I need to enable some kernel stuff to make it work?
```
[02:13:00] Failed to load binder driver for devices: anbox-binder,anbox-vndbinder,anbox-hwbinder
[02:13:00] modprobe: FATAL: Module binder_linux not found in directory /lib/modules/5.15.16_1
[02:13:00] ERROR: Binder node "binder" for waydroid not found
[02:13:00] See also: <https://github.com/waydroid>
Run 'waydroid log' for details.
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (6 preceding siblings ...)
  2022-01-23  1:15 ` notthewave
@ 2022-01-23  1:16 ` notthewave
  2022-01-30 13:12 ` Johnnynator
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: notthewave @ 2022-01-23  1:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#discussion_r790201848

Comment:
this is where xlint complains when I tried

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (7 preceding siblings ...)
  2022-01-23  1:16 ` [PR REVIEW] " notthewave
@ 2022-01-30 13:12 ` Johnnynator
  2022-01-30 13:12 ` Johnnynator
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-01-30 13:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 958 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1025140873

Comment:
> Do I need to enable some kernel stuff to make it work?
> 
> ```
> [02:13:00] Failed to load binder driver for devices: anbox-binder,anbox-vndbinder,anbox-hwbinder
> [02:13:00] modprobe: FATAL: Module binder_linux not found in directory /lib/modules/5.15.16_1
> [02:13:00] ERROR: Binder node "binder" for waydroid not found
> [02:13:00] See also: <https://github.com/waydroid>
> Run 'waydroid log' for details.
> ```

Right now only the pinebookpro and pinephone kernels do have the needed modules enabled by default.
Right now you would need to switch these options in the dotconfig of whichever kernel you are using and recompile it.

```
CONFIG_ASHMEM=y
CONFIG_ANDROID=y 
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
```


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (8 preceding siblings ...)
  2022-01-30 13:12 ` Johnnynator
@ 2022-01-30 13:12 ` Johnnynator
  2022-01-30 16:21 ` [PR PATCH] [Updated] " Johnnynator
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-01-30 13:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1025140873

Comment:
> Do I need to enable some kernel stuff to make it work?
> 
> ```
> [02:13:00] Failed to load binder driver for devices: anbox-binder,anbox-vndbinder,anbox-hwbinder
> [02:13:00] modprobe: FATAL: Module binder_linux not found in directory /lib/modules/5.15.16_1
> [02:13:00] ERROR: Binder node "binder" for waydroid not found
> [02:13:00] See also: <https://github.com/waydroid>
> Run 'waydroid log' for details.
> ```

Right now only the pinebookpro and pinephone kernels do have the needed modules enabled by default.
You would need to switch these options in the dotconfig of whichever kernel you are using and recompile it.

```
CONFIG_ASHMEM=y
CONFIG_ANDROID=y 
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
```


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (9 preceding siblings ...)
  2022-01-30 13:12 ` Johnnynator
@ 2022-01-30 16:21 ` Johnnynator
  2022-03-07 18:07 ` Relected
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-01-30 16:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135

New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Quick notes for testing:

- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`

A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 9327 bytes --]

From 33a44d922a4136409b2ed08752acfd967dd2710d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/5] New package: libglibutil-1.0.55

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index edcf9daee61c..86ea75527a3d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -113,6 +113,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 4468c1c1df945ddb1e1ecafd59ddefb20962d75c Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/5] New package: libgbinder-1.1.11

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 86ea75527a3d..3a0f6a2e692d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -114,6 +114,7 @@ libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
 libGLU.so.1 glu-9.0.0_1
 libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 6704af2e4350eb271227b55b99592388756df844 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/5] New package: waydroid-1.1.0

---
 srcpkgs/waydroid/files/gbinder.conf           |  2 ++
 srcpkgs/waydroid/files/waydroid-container/run |  3 ++
 .../waydroid/files/waydroid-session.desktop   |  8 ++++++
 srcpkgs/waydroid/template                     | 28 +++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..252b802ff525
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,28 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.0
+revision=1
+depends="gbinder-python lxc python3-gobject python3-pyclip"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${version}.tar.gz"
+checksum=0526c84562dfeb688961d9d7e697d557869bf08442b640554d1e07788df098c4
+pycompile_dirs="/usr/lib/waydroid"
+python_version=3
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vmkdir usr/bin
+
+	vcopy tools usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vinstall waydroid.py 755 usr/lib/waydroid
+	ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall $FILESDIR/gbinder.conf 644 etc
+	vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+	vsv waydroid-container
+}

From ed2022e55658e6f4bb078830154582dcf0100653 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 4/5] New package: gbinder-python-0.0.0.20210812

---
 srcpkgs/gbinder-python/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9

From 88055f4c01eb49814a7dfc7f74ffb5c70028a9ab Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Tue, 19 Oct 2021 22:59:06 +0200
Subject: [PATCH 5/5] New package: python3-pyclip-0.5.3

---
 srcpkgs/python3-pyclip/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..996b9773e8a1
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.5.3
+revision=1
+wrksrc="pyclip-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="${PYPI_SITE}/p/pyclip/pyclip-${version}.tar.gz"
+checksum=8c6588179c3f6e6e642650346c57fb0b846ce291262402580e7f3548eca774f9

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (10 preceding siblings ...)
  2022-01-30 16:21 ` [PR PATCH] [Updated] " Johnnynator
@ 2022-03-07 18:07 ` Relected
  2022-03-07 21:11 ` Johnnynator
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Relected @ 2022-03-07 18:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1060976477

Comment:
@Johnnynator any news on this?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (11 preceding siblings ...)
  2022-03-07 18:07 ` Relected
@ 2022-03-07 21:11 ` Johnnynator
  2022-06-06  2:15 ` github-actions
  2022-06-19  8:19 ` [PR PATCH] [Closed]: " Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-03-07 21:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1061140793

Comment:
I haven't looked into the network issue properly yet and I currently neither have time nor too much motivation. So if someone wants to pick it up or debug the issue, they are free to take over.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (12 preceding siblings ...)
  2022-03-07 21:11 ` Johnnynator
@ 2022-06-06  2:15 ` github-actions
  2022-06-19  8:19 ` [PR PATCH] [Closed]: " Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2022-06-06  2:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/33135#issuecomment-1146964294

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Closed]: New package: waydroid
  2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
                   ` (13 preceding siblings ...)
  2022-06-06  2:15 ` github-actions
@ 2022-06-19  8:19 ` Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-06-19  8:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1799 bytes --]

There's a closed pull request on the void-packages repository

New package: waydroid
https://github.com/void-linux/void-packages/pull/33135

Description:
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Quick notes for testing:

- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2022-06-19  8:19 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-26 15:25 [PR PATCH] New package: waydroid Johnnynator
2021-09-26 15:34 ` [PR PATCH] [Updated] " Johnnynator
2021-09-26 16:21 ` Johnnynator
2021-09-26 16:55 ` Anachron
2021-09-26 17:36 ` Johnnynator
2021-09-28 13:09 ` [PR PATCH] [Updated] " Johnnynator
2021-09-28 17:35 ` q66
2022-01-23  1:15 ` notthewave
2022-01-23  1:16 ` [PR REVIEW] " notthewave
2022-01-30 13:12 ` Johnnynator
2022-01-30 13:12 ` Johnnynator
2022-01-30 16:21 ` [PR PATCH] [Updated] " Johnnynator
2022-03-07 18:07 ` Relected
2022-03-07 21:11 ` Johnnynator
2022-06-06  2:15 ` github-actions
2022-06-19  8:19 ` [PR PATCH] [Closed]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).