diff options
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 82 |
2 files changed, 45 insertions, 61 deletions
@@ -1,6 +1,6 @@ pkgbase = vmware-horizon-client pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop - pkgver = 2203 + pkgver = 2312.1 pkgrel = 1 url = https://www.vmware.com/go/viewclients arch = x86_64 @@ -8,12 +8,13 @@ pkgbase = vmware-horizon-client makedepends = libxslt makedepends = patchelf makedepends = librsvg - source = vmware-horizon-client-2203-8.5.0-19586897-x86_64.bundle::https://download3.vmware.com/software/CART23FQ1_LIN64_2203/VMware-Horizon-Client-2203-8.5.0-19586897.x64.bundle - source = vmware-bundle.eclass-2203::https://gitweb.gentoo.org/proj/vmware.git/plain/eclass/vmware-bundle.eclass + options = !debug + source = vmware-horizon-client-2312.1-8.12.1-23543969-x86_64.bundle::https://download3.vmware.com/software/CART25FQ1_LIN64_2312.1/VMware-Horizon-Client-2312.1-8.12.1-23543969.x64.bundle + source = vmware-bundle.eclass-2312.1::https://gitweb.gentoo.org/proj/vmware.git/plain/eclass/vmware-bundle.eclass source = vmware-horizon-usb source = vmware-horizon-usb.service source = vmware-horizon.svg - sha256sums = a8afe52dddcf02f98af74a74716c8ac5da87c05d7eda240f48075e730850c495 + sha256sums = 37bb1116b398c1e0786b03103f48a54f62c56de2420f00771ea47c7c0e5acc8d sha256sums = d6863e92b891fc506fc8e81714a47ca3f9f74b7fe68bdf48be058d5e0d433033 sha256sums = 008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f sha256sums = a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226 @@ -21,15 +22,16 @@ pkgbase = vmware-horizon-client pkgname = vmware-horizon-client install = vmware-horizon-client.install + depends = binutils + depends = expat + depends = gcc-libs + depends = glib2 depends = gtk3 depends = libudev0-shim depends = libxml2 depends = libxss depends = libxtst depends = openssl - depends = binutils - depends = glib2 - depends = expat depends = vmware-keymaps optdepends = alsa-lib: audio support via alsa optdepends = freerdp: RDP remote desktop connections @@ -40,14 +42,15 @@ pkgname = vmware-horizon-client optdepends = vmware-horizon-mmr: MultiMedia Redirection optdepends = vmware-horizon-rtav: Real-Time Audio-Video (webcam and audio-in) optdepends = vmware-horizon-smartcard: smartcard authentication - optdepends = vmware-horizon-teams-optimization: Teams optimization optdepends = vmware-horizon-tsdr: folder sharing optdepends = vmware-horizon-usb: USB device redirection conflicts = vmware-view-open-client conflicts = vmware-view-open-client-beta conflicts = vmware-view-client conflicts = vmware-horizon-pcoip + conflicts = vmware-horizon-teams-optimization replaces = vmware-horizon-pcoip + replaces = vmware-horizon-teams-optimization pkgname = vmware-horizon-html5mmr pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop - HTML5 MultiMedia Redirection @@ -74,7 +77,6 @@ pkgname = vmware-horizon-mmr pkgname = vmware-horizon-rtav pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop - Real-Time Audio-Video (webcam and audio-in) depends = vmware-horizon-client - depends = gcc-libs depends = libutil-linux depends = zlib depends = glib2 @@ -85,10 +87,6 @@ pkgname = vmware-horizon-smartcard depends = pcsclite depends = glib2 -pkgname = vmware-horizon-teams-optimization - pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop - Teams optimization - depends = vmware-horizon-client - pkgname = vmware-horizon-tsdr pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop - folder sharing depends = vmware-horizon-client @@ -8,7 +8,6 @@ pkgname=( 'vmware-horizon-mmr' 'vmware-horizon-rtav' 'vmware-horizon-smartcard' - 'vmware-horizon-teams-optimization' 'vmware-horizon-tsdr' 'vmware-horizon-usb') _bundled_with_client=( @@ -20,13 +19,14 @@ _unused_components=( 'vmware-horizon-scannerclient' 'vmware-horizon-serialportclient' 'vmware-horizon-url-redirection') -pkgver=2203 -_build1=8.5.0 -_build2=19586897 -_cart="CART23FQ1_LIN64_${pkgver/./_}" +pkgver=2312.1 +_build1=8.12.1 +_build2=23543969 +_cart="CART25FQ1_LIN64_${pkgver}" pkgrel=1 pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop' arch=('x86_64') +options=('!debug') url='https://www.vmware.com/go/viewclients' license=('custom') makedepends=('libxslt' 'patchelf' 'librsvg') @@ -35,7 +35,7 @@ source=("${pkgbase}-${pkgver}-${_build1}-${_build2}-x86_64.bundle::https://downl 'vmware-horizon-usb' 'vmware-horizon-usb.service' 'vmware-horizon.svg') -sha256sums=('a8afe52dddcf02f98af74a74716c8ac5da87c05d7eda240f48075e730850c495' +sha256sums=('37bb1116b398c1e0786b03103f48a54f62c56de2420f00771ea47c7c0e5acc8d' 'd6863e92b891fc506fc8e81714a47ca3f9f74b7fe68bdf48be058d5e0d433033' '008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f' 'a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226' @@ -61,6 +61,9 @@ prepare() { # remove legacy stuff find "${srcdir}/extract/" -name 'legacy' -print0 | xargs -0 rm -rf + + # let's use our libstdc++ from gcc-libs... + rm -rf "${srcdir}/extract/vmware-horizon-pcoip/usr/lib/vmware/gcc" } build() { @@ -69,7 +72,7 @@ build() { for bundle in "${pkgname[@]}" "${_bundled_with_client[@]}"; do for FILE in $(find "${bundle}" -type f); do # executables and libraries only - file --mime "${FILE}" | egrep -q "(application/x-(pie-)?(executable|sharedlib)|text/x-shellscript)" || continue + file --mime "${FILE}" | grep -Eq "(application/x-(pie-)?(executable|sharedlib)|text/x-shellscript)" || continue # make executable chmod +x "${FILE}" @@ -77,25 +80,25 @@ build() { done # remove rpath to fix dynamic linking... - for LIB in ${srcdir}/extract/vmware-horizon-pcoip/lib/vmware/lib*.so*; do + for LIB in ${srcdir}/extract/vmware-horizon-pcoip/usr/lib/vmware/lib*.so*; do patchelf --remove-rpath "${LIB}" done # remove keymap files, depend on vmware-keymaps instead - rm -rf "${srcdir}"/extract/vmware-horizon-pcoip/lib/vmware/xkeymap/ + rm -rf "${srcdir}"/extract/vmware-horizon-pcoip/usr/lib/vmware/xkeymap/ # remove png icon, we install svg and rendered pngs sed -i -e '/Name=/a Comment=Connect to VMware Horizon View virtual machines' -e '/^Icon=/c Icon=vmware-horizon' \ - "${srcdir}"/extract/vmware-horizon-client/share/applications/vmware-view.desktop - rm -r "${srcdir}"/extract/vmware-horizon-client/share/{icons,pixmaps}/ + "${srcdir}"/extract/vmware-horizon-client/usr/share/applications/vmware-view.desktop + rm -r "${srcdir}"/extract/vmware-horizon-client/usr/share/{icons,pixmaps}/ } package_vmware-horizon-client() { conflicts=('vmware-view-open-client' 'vmware-view-open-client-beta' 'vmware-view-client' - 'vmware-horizon-pcoip') - replaces=('vmware-horizon-pcoip') - depends=('gtk3' 'libudev0-shim' 'libxml2' 'libxss' - 'libxtst' 'openssl' 'binutils' 'glib2' 'expat' 'vmware-keymaps') + 'vmware-horizon-pcoip' 'vmware-horizon-teams-optimization') + replaces=('vmware-horizon-pcoip' 'vmware-horizon-teams-optimization') + depends=('binutils' 'expat' 'gcc-libs' 'glib2' 'gtk3' 'libudev0-shim' 'libxml2' 'libxss' + 'libxtst' 'openssl' 'vmware-keymaps') optdepends=('alsa-lib: audio support via alsa' 'freerdp: RDP remote desktop connections' 'libpulse: audio support via pulse sound server' @@ -105,30 +108,24 @@ package_vmware-horizon-client() { 'vmware-horizon-mmr: MultiMedia Redirection' 'vmware-horizon-rtav: Real-Time Audio-Video (webcam and audio-in)' 'vmware-horizon-smartcard: smartcard authentication' - 'vmware-horizon-teams-optimization: Teams optimization' 'vmware-horizon-tsdr: folder sharing' 'vmware-horizon-usb: USB device redirection') install=vmware-horizon-client.install cd "${srcdir}/extract/vmware-horizon-client/" - - mkdir -p "${pkgdir}/usr/" - cp -a 'bin/' "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" - cp -a 'share/' "${pkgdir}/usr/" - - mkdir -p "${pkgdir}/usr/share/doc/" - cp -a 'doc/' "${pkgdir}/usr/share/doc/vmware-horizon-client" + cp -a 'usr/' "${pkgdir}/" cd "${srcdir}/extract/vmware-horizon-pcoip/" - - mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" cd "${srcdir}/extract/vmware-horizon-hosted-apps/" + cp -a 'usr/' "${pkgdir}/" - mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + # drop duplicate libraries + for LIB in 'vaapi2' 'vaapi2.7' 'vdpau'; do + rm -rf "${pkgdir}/usr/lib/vmware/view/${LIB}" + ln -s software "${pkgdir}/usr/lib/vmware/view/${LIB}" + done install -D -m0644 "${srcdir}/vmware-horizon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/vmware-horizon.svg" for SIZE in 16 24 32 48 64 96 128; do @@ -145,7 +142,7 @@ package_vmware-horizon-html5mmr() { cd "${srcdir}/extract/vmware-horizon-html5mmr/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-integrated-printing() { @@ -157,7 +154,7 @@ package_vmware-horizon-integrated-printing() { cd "${srcdir}/extract/vmware-horizon-integrated-printing/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-mmr() { @@ -169,17 +166,17 @@ package_vmware-horizon-mmr() { cd "${srcdir}/extract/vmware-horizon-mmr/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-rtav() { pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop - Real-Time Audio-Video (webcam and audio-in)' - depends=('vmware-horizon-client' 'gcc-libs' 'libutil-linux' 'zlib' 'glib2') + depends=('vmware-horizon-client' 'libutil-linux' 'zlib' 'glib2') cd "${srcdir}/extract/vmware-horizon-rtav/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-smartcard() { @@ -189,17 +186,7 @@ package_vmware-horizon-smartcard() { cd "${srcdir}/extract/vmware-horizon-smartcard/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" -} - -package_vmware-horizon-teams-optimization() { - pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop - Teams optimization' - depends=('vmware-horizon-client') - - cd "${srcdir}/extract/vmware-horizon-teams-optimization/" - - mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-tsdr() { @@ -209,7 +196,7 @@ package_vmware-horizon-tsdr() { cd "${srcdir}/extract/vmware-horizon-tsdr/" mkdir -p "${pkgdir}/usr/" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" } package_vmware-horizon-usb() { @@ -220,8 +207,7 @@ package_vmware-horizon-usb() { cd "${srcdir}/extract/vmware-horizon-usb/" mkdir -p "${pkgdir}/usr/lib/vmware/view/" - cp -a 'bin/' "${pkgdir}/usr/lib/vmware/view/usb" - cp -a 'lib/' "${pkgdir}/usr/" + cp -a 'usr/' "${pkgdir}/" install -D -m0755 "${srcdir}/vmware-horizon-usb" "${pkgdir}/usr/lib/systemd/scripts/vmware-horizon-usb" install -D -m0644 "${srcdir}/vmware-horizon-usb.service" "${pkgdir}/usr/lib/systemd/system/vmware-horizon-usb.service" |