fix(ci/package_on_device): do not conflict gh release upload archive filename with packages.yml (#2044)

* revbump(tur/darktable): for `imath` 3.2.2

* revbump(tur-on-device/openshadinglanguage): for `imath` 3.2.2

* revbump(tur-on-device/usd): for `openvdb` 13.0.0

* revbump(tur-on-device/blender): for `openvdb` 13.0.0

* revbump(tur-on-device/blender4): for `openvdb` 13.0.0

* fix(ci/package_on_device): do not conflict `gh release upload` `archive` filename with `packages.yml`

* fix(common-files/building-system-patches): change `git fetch` in `lint-packages.sh` to TUR URL

Author: robertkirkman

.github/workflows/package_on_device.yml

@@ -282,8 +282,10 @@ jobs:
       run: |
         GITHUB_SHA=${{ github.sha }}
         for archive in debs-*/debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}.tar; do
-          gh release upload -R https://github.com/termux-user-repository/tur "0.1" $archive
-          echo "$archive  uploaded"
+          tur_on_device_archive="${archive//.tar/-tur-on-device.tar}"
+          mv "$archive" "$tur_on_device_archive"
+          gh release upload -R https://github.com/termux-user-repository/tur "0.1" "$tur_on_device_archive"
+          echo "$tur_on_device_archive uploaded"
         done
     - name: Trigger workflow in dists repository
       env:

common-files/building-system-patches/0009-allow-lint-packages-version-check.patch

@@ -0,0 +1,15 @@
+'git reset HEAD~' is TEMPORARY - work around bug in lint-packages.sh
+will discuss with Tomjo2000 and fix upstream later
+
+--- a/scripts/lint-packages.sh
++++ b/scripts/lint-packages.sh
+@@ -124,7 +124,8 @@ check_indentation() {
+ # We'll need the 'origin/master' as a base commit when running the version check.
+ # So try fetching it now if it doesn't exist.
++git reset HEAD~
+ if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then
+-	git fetch https://github.com/termux/termux-packages.git
++	git fetch https://github.com/termux-user-repository/tur.git
+ 	base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"
+ fi
+ 

tur-on-device/blender/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_DESCRIPTION="A fully integrated 3D graphics creation suite (legacy ve
 TERMUX_PKG_LICENSE="GPL-3.0-or-later"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
 TERMUX_PKG_VERSION=1:3.6.23
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=git+https://projects.blender.org/blender/blender
 # Blender does not support 32-bit
 TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"

tur-on-device/blender4/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_DESCRIPTION="A fully integrated 3D graphics creation suite"
 TERMUX_PKG_LICENSE="GPL-3.0-or-later"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
 TERMUX_PKG_VERSION=4.5.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=git+https://projects.blender.org/blender/blender
 # Blender does not support 32-bit
 TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"

tur-on-device/openshadinglanguage/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Advanced shading language for production GI renderers"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
 TERMUX_PKG_VERSION="1.14.7.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/download/v$TERMUX_PKG_VERSION/OSL-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=45b2b9de1bae6854fb8af0d332c3266898871d95741bdb6abe8178cd6d01aef2
 TERMUX_PKG_DEPENDS="freetype, imath, libc++, libpng, libtiff, ncurses, openimageio, qt6-qtbase, zlib"

tur-on-device/usd/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="High-performance extensible software platform for collab
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
 TERMUX_PKG_VERSION="25.11"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/PixarAnimationStudios/OpenUSD/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=c37c633b5037a4552f61574670ecca8836229b78326bd62622f3422671188667
 TERMUX_PKG_DEPENDS="alembic, draco, embree, fmt, glew, imath, libc++, libx11, libxt, materialx, libandroid-glob, libtbb, opencolorio, openexr, openimageio, openshadinglanguage, opensubdiv, openvdb, ptex, pyside6, python-opengl"

tur/darktable/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Virtual lighttable and darkroom for photographers"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
 TERMUX_PKG_VERSION="5.2.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/darktable-org/darktable/releases/download/release-${TERMUX_PKG_VERSION}/darktable-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=53a46cd46ef7118485c4abf4ab407c181639bb8634243ec0ed1f7c1e8299bec6
 TERMUX_PKG_DEPENDS="exiv2, gdk-pixbuf, glib, graphicsmagick, gtk3, imath, json-glib, lensfun, libandroid-glob, libc++, libcairo, libcurl, libheif, libicu, libjpeg-turbo, libjxl, libllvm, liblua54, libpng, libpugixml, librsvg, libsqlite, libtiff, libwebp, libxml2, littlecms, ltrace, openexr, openjpeg, pango, portmidi, zlib"