diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-15 09:02:35 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-15 09:31:14 -0400 |
| commit | d5a37be5d25b605a3896c6245d818bcd2614d57e (patch) | |
| tree | 5031a4a0ac08f9793e0faecd22b94731accee88f /libre/blender | |
| parent | 0707bfd6d1c76ca3f3174026b2473fbaff00eadc (diff) | |
housekeeping - nornmalize _version_constraint() implementations across PKGBUILDs
Diffstat (limited to 'libre/blender')
| -rw-r--r-- | libre/blender/PKGBUILD | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index be3475e01..09e3b7f15 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -88,7 +88,7 @@ _version_constraint() # (dep_pkgname [precision]) local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) local def_precision=$(( n_dots + 1 )) local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) - local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} ) + local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) local pkgver_rx='[0-9A-Za-z_]+' pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, # but some pkgver have it (eg: 5.15.10+kde+r130) @@ -97,16 +97,16 @@ _version_constraint() # (dep_pkgname [precision]) local garbage_rx='[^0-9].*' local capture_rx=${pkgver_rx} for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; - local version pkgrel has_split_char version_min version_max constraint_string + local version pkgrel has_dot_char version_min version_max constraint_string declare -i subver subver_inc pkgrel_inc if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision #unused=${BASH_REMATCH[2]} # discarded pkgver segments pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed - has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; ) + has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric - version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} ) + version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) subver_inc=$(( subver + 1 )) pkgrel_inc=$(( pkgrel + 1 )) version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ @@ -236,14 +236,14 @@ package() { # libboost_filesystem.so <- openimageio, # libboost_thread.so <- openshadinglanguage, # libboost_iostreams.so <- openvdb - depends+=( libboost_locale.so - $(_version_constraint opencolorio 2) # eg: libOpenColorIO.so.2.1 - $(_version_constraint openexr 2) # eg: libHalf.so.12 - $(_version_constraint openimageio 2) # eg: libOpenImageIO.so.2.0 - $(_version_constraint openshadinglanguage 2) # eg: liboslcomp.so.1.10 - $(_version_constraint opensubdiv 3) # eg: libosdGPU.so.3.3.3 - $(_version_constraint openvdb 2) # eg: libopenvdb.so.6.2 - $(_version_constraint python 2) ) # eg: libpython3.6.so.1.0 + depends+=( libboost_locale.so ) + depends=( ${depends[*]/opencolorio/} $(_version_constraint opencolorio 2) ) # eg: libOpenColorIO.so.2.1 + depends=( ${depends[*]/openexr/} $(_version_constraint openexr 2) ) # eg: libHalf.so.12 + depends=( ${depends[*]/openimageio/} $(_version_constraint openimageio 2) ) # eg: libOpenImageIO.so.2.0 + depends=( ${depends[*]/openshadinglanguage/} $(_version_constraint openshadinglanguage 2) ) # eg: liboslcomp.so.1.10 + depends=( ${depends[*]/opensubdiv/} $(_version_constraint opensubdiv 3) ) # eg: libosdGPU.so.3.3.3 + depends=( ${depends[*]/openvdb/} $(_version_constraint openvdb 2) ) # eg: libopenvdb.so.6.2 + depends=( ${depends[*]/python/} $(_version_constraint python 2) ) # eg: libpython3.6.so.1.0 DESTDIR="${pkgdir}" cmake --install build install -Dm755 release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl" |