<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a961d10cb8169887743093440d3b96234062254">https://github.com/macports/macports-ports/commit/9a961d10cb8169887743093440d3b96234062254</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9a961d10cb8 android-platform-tools: update to version 34.0.5, expand support
</span>9a961d10cb8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a961d10cb8169887743093440d3b96234062254
</span>Author: aprovera <64255236+aprovera@users.noreply.github.com>
AuthorDate: Thu Oct 12 16:32:13 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> android-platform-tools: update to version 34.0.5, expand support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 34.0.5
</span><span style='display:block; white-space:pre;color:#404040;'> * add arm64 and i386 supported_archs
</span><span style='display:block; white-space:pre;color:#404040;'> * refactor using subports
</span><span style='display:block; white-space:pre;color:#404040;'> * add -latest subport for current version
</span><span style='display:block; white-space:pre;color:#404040;'> * add -no_sse4 subport for x86_64 machines with no SSE4
</span><span style='display:block; white-space:pre;color:#404040;'> * add -i386 subport for 32-bit x86 machines
</span><span style='display:block; white-space:pre;color:#404040;'> * automatically select legacy subports as needed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66670
</span>---
java/android-platform-tools/Portfile | 99 +++++++++++++++++++++++++++++++-----
1 file changed, 86 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/android-platform-tools/Portfile b/java/android-platform-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fb2ff63bfc..cba6e014471 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/android-platform-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/android-platform-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,41 +3,114 @@
</span> PortSystem 1.0
name android-platform-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 34.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 34.0.5
</span> categories java devel
installs_libs no
maintainers {judaew @judaew} openmaintainer
homepage https://developer.android.com/studio/
description Platform-Tools for Google Android SDK (adb and fastboot)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span> # different files are covered with different licenses. See
# platform-tools/NOTICE.txt for details
license BSD MIT NCSA Apache-2 GPL-2 LGPL-2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites https://dl.google.com/android/repository
distname platform-tools_r${version}-darwin
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d3fa505c1df870918aec9e7aee5f668abc957668 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd09b834c150181a383deba63e157e9a53a6eb5a9cf4849b2b79dd89d0a2ddf1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11208053
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5c3e0f5cf838a317b79e985b6c023e000be64ee2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b2c9757744a9d01fcc616b893ac6236233caf1bdf2ef384d73371ab68bfc4a43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11194858
</span>
use_configure no
worksrcdir platform-tools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# detect which version to depend on based on HW capabilities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${configure.build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:android-platform-tools-latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {sysctl hw.optional.sse4_1} sse4] && $sse4 == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:android-platform-tools-latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:android-platform-tools-no_sse4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:android-platform-tools-i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:android-platform-tools-latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# define versioned subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport android-platform-tools-latest {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport android-platform-tools-no_sse4 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 31.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Platform-Tools for Google Android SDK (adb and fastboot): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacy version for non-SSE4 64-bit Intel CPUs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ver_hash e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${ver_hash}.platform-tools_r${version}-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 26a2d4602ddd7537798bacd3adf6d5c376dc3e77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 773c08cfa31cec1bb4568ce5b374366e6310a5ffc21875024604a0f65bc831b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13227985
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "The current version of ${name} requires SSE4.1, which is not \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported by your CPU. The last version compatible with your CPU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (${version}) has been installed instead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport android-platform-tools-i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 23.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Platform-Tools for Google Android SDK (adb and fastboot): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacy version for 32-bit Intel CPUs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname platform-tools_r${version}-macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7d0d3fbfdf2bbb8e1d6430373da88c2e77b9c6de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d2439f5de236c3831c048b678653c5955487351be8e196c65923b4eca5c47692 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2489850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "The current version of ${name} requires a 64-bit CPU. The last \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version compatible with your CPU (${version}) has been installed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_dir ${prefix}/share/java/android-sdk-macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${sdk_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath} ${destroot}${sdk_dir}/platform-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport ne $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_dir ${prefix}/share/java/android-sdk-macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${sdk_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath} ${destroot}${sdk_dir}/platform-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin {adb fastboot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${sdk_dir}/platform-tools/${bin} ${destroot}${prefix}/bin/${bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/ReadMe.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin {adb fastboot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${sdk_dir}/platform-tools/${bin} ${destroot}${prefix}/bin/${bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {lindex [registry_active android-platform-tools] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 34.0.5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite android-platform-tools "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>