From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001 From: John Zimmermann 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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